Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc76c8011ca9563b168a57f9bb4a2d81af7a13799 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c76c8011ca9563b168a57f9bb4a2d81af7a13799) @@ -722,6 +722,7 @@ index.kumalive.enter.learner =Enter as a learner index.kumalive.report =Reports index.kumalive.rubric =Rubrics management +index.planner =Planner label.import.groups.from.template =Import groups from template label.import.groups.from.template.description =Download the template spreadsheet to create your groups using all the present learners in this lesson/course. Once you upload the file, the groups will be automatically created according to the spreadsheet. label.download.template =Download Template Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc76c8011ca9563b168a57f9bb4a2d81af7a13799 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision c76c8011ca9563b168a57f9bb4a2d81af7a13799) @@ -45,14 +45,14 @@ function openPedagogicalPlanner() { if(isMac) { - authorWin = window.open('planner/pedagogicalPlanner.do','aWindow','width=' + pedagogical_planner_width + authorWin = window.open('planner/pedagogicalPlanner/start.do','aWindow','width=' + pedagogical_planner_width + ',height=' + pedagogical_planner_height + ',resizable,scrollbars' + getCenterParams(pedagogical_planner_width, pedagogical_planner_height)); } else { - if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('pedagogicalPlanner.do') > -1) { + if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('pedagogicalPlanner/start.do') > -1) { authorWin.focus(); } else { - authorWin = window.open('planner/pedagogicalPlanner.do','aWindow','width=' + pedagogical_planner_width + authorWin = window.open('planner/pedagogicalPlanner/start.do','aWindow','width=' + pedagogical_planner_width + ',height=' + pedagogical_planner_height + ',resizable,scrollbars' + getCenterParams(pedagogical_planner_width, pedagogical_planner_height)); authorWin.focus(); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180924.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180924.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180924.sql (revision c76c8011ca9563b168a57f9bb4a2d81af7a13799) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4184 Allow longer ID format + +ALTER TABLE lams_planner_nodes MODIFY COLUMN content_folder_id CHAR(36); + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1;