Skip to content
Snippets Groups Projects
Commit 998ab6fb authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.5 to OpenOLAT default branch with 2be076f27f2681273cc1cc3f64a63c6a1c73d366

parents 0b9da5b9 3c58418d
No related branches found
No related tags found
No related merge requests found
<fieldset class="o_form form-horizontal clearfix"> <fieldset class="o_form form-horizontal clearfix">
<legend> <legend>$r.translate("header") $r.contextHelpWithWrapper("Learning resource: Video#_video_courseelement")</legend>
$r.translate("header")</legend>
#if ($showPreviewButton) #if ($showPreviewButton)
<div class="form-group"> <div class="form-group">
......
...@@ -76,7 +76,7 @@ public class VideoQualityTableFormController extends FormBasicController { ...@@ -76,7 +76,7 @@ public class VideoQualityTableFormController extends FormBasicController {
FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator()); FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator());
generalCont.setFormTitle(translate("tab.video.qualityConfig")); generalCont.setFormTitle(translate("tab.video.qualityConfig"));
generalCont.setRootForm(mainForm); generalCont.setRootForm(mainForm);
generalCont.setFormContextHelp("Video Tracks"); generalCont.setFormContextHelp("Learning resource: Video#_video_resolution");
formLayout.add(generalCont); formLayout.add(generalCont);
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
......
...@@ -80,7 +80,7 @@ public class VideoTrackEditController extends FormBasicController { ...@@ -80,7 +80,7 @@ public class VideoTrackEditController extends FormBasicController {
FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator()); FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator());
generalCont.setFormTitle(translate("tab.video.trackConfig")); generalCont.setFormTitle(translate("tab.video.trackConfig"));
generalCont.setRootForm(mainForm); generalCont.setRootForm(mainForm);
generalCont.setFormContextHelp("Video Tracks"); generalCont.setFormContextHelp("Learning resource: Video#_video_subtitle");
formLayout.add(generalCont); formLayout.add(generalCont);
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
......
...@@ -333,7 +333,10 @@ public class ACMethodDAO implements GenericEventListener { ...@@ -333,7 +333,10 @@ public class ACMethodDAO implements GenericEventListener {
.createQuery(sb.toString(), AccessMethod.class) .createQuery(sb.toString(), AccessMethod.class)
.getResultList(); .getResultList();
if(methods.isEmpty() && enable) { if(methods.isEmpty() && enable) {
dbInstance.saveObject(new TokenAccessMethod()); TokenAccessMethod method = new TokenAccessMethod();
method.setCreationDate(new Date());
method.setLastModified(method.getCreationDate());
dbInstance.saveObject(method);
} else { } else {
for(AccessMethod method:methods) { for(AccessMethod method:methods) {
if(method.isEnabled() != enable) { if(method.isEnabled() != enable) {
...@@ -352,7 +355,10 @@ public class ACMethodDAO implements GenericEventListener { ...@@ -352,7 +355,10 @@ public class ACMethodDAO implements GenericEventListener {
TypedQuery<AccessMethod> query = dbInstance.getCurrentEntityManager().createQuery(sb.toString(), AccessMethod.class); TypedQuery<AccessMethod> query = dbInstance.getCurrentEntityManager().createQuery(sb.toString(), AccessMethod.class);
List<AccessMethod> methods = query.getResultList(); List<AccessMethod> methods = query.getResultList();
if(methods.isEmpty() && enable) { if(methods.isEmpty() && enable) {
dbInstance.saveObject(new FreeAccessMethod()); FreeAccessMethod method = new FreeAccessMethod();
method.setCreationDate(new Date());
method.setLastModified(method.getCreationDate());
dbInstance.saveObject(method);
} else { } else {
for(AccessMethod method:methods) { for(AccessMethod method:methods) {
if(method.isEnabled() != enable) { if(method.isEnabled() != enable) {
......
...@@ -205,6 +205,8 @@ public class PaypalManagerImpl extends BasicManager implements PaypalManager { ...@@ -205,6 +205,8 @@ public class PaypalManagerImpl extends BasicManager implements PaypalManager {
smethod = methods.get(0); smethod = methods.get(0);
} else { } else {
smethod = new PaypalAccessMethod(); smethod = new PaypalAccessMethod();
smethod.setCreationDate(new Date());
smethod.setLastModified(smethod.getCreationDate());
save(smethod); save(smethod);
} }
for(PaypalAccessMethod method:methods) { for(PaypalAccessMethod method:methods) {
......
alter table o_gta_task modify g_taskname varchar(1024); alter table o_gta_task modify g_taskname varchar(1024);
\ No newline at end of file
update o_ac_method set creationdate=now() where creationdate is null;
update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file
alter table o_gta_task modify g_taskname varchar2(1024 char); alter table o_gta_task modify g_taskname varchar2(1024 char);
update o_ac_method set creationdate=systimestamp where creationdate is null;
update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file
alter table o_gta_task alter column g_taskname type varchar(1024); alter table o_gta_task alter column g_taskname type varchar(1024);
update o_ac_method set creationdate=now() where creationdate is null;
update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment