Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml =================================================================== diff -u -r7933051bd1404465e4224cb06b025568de188fcd -r8e2527dec3a9ab0f4452577d049ae63d5e5647ae --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision 7933051bd1404465e4224cb06b025568de188fcd) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision 8e2527dec3a9ab0f4452577d049ae63d5e5647ae) @@ -100,16 +100,6 @@ - - - - @hibernate.property - column="enable_monitor_gradebook" - length="1" not-null="true" - - - Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql (revision 8e2527dec3a9ab0f4452577d049ae63d5e5647ae) @@ -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-4334 Add a new Gradebook tab to Monitor + +ALTER TABLE lams_organisation DROP COLUMN enable_monitor_gradebook; + +----------------------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; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -r7933051bd1404465e4224cb06b025568de188fcd -r8e2527dec3a9ab0f4452577d049ae63d5e5647ae --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 7933051bd1404465e4224cb06b025568de188fcd) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 8e2527dec3a9ab0f4452577d049ae63d5e5647ae) @@ -92,9 +92,6 @@ private Boolean enableCourseNotifications; /** persistent field */ - private Boolean enableGradebookForMonitors; - - /** persistent field */ private Boolean enableGradebookForLearners; /** persistent field */ @@ -116,7 +113,6 @@ this.courseAdminCanCreateGuestAccounts = Boolean.FALSE; this.enableCourseNotifications = Boolean.FALSE; this.enableGradebookForLearners = Boolean.FALSE; - this.enableGradebookForMonitors = Boolean.TRUE; this.enableSingleActivityLessons = Boolean.FALSE; this.enableLiveEdit = Boolean.FALSE; } @@ -339,21 +335,6 @@ this.orderedLessonIds = orderedLessonIds; } - /** getEnableGradebookForMonitors() is now deprecated as we always display gradebook in monitor. - * For compatibility with existing code, this will always true - * @return - */ - @Deprecated - public Boolean getEnableGradebookForMonitors() { - return true; - } - - /** See getEnableGradebookForMonitors() */ - @Deprecated - public void setEnableGradebookForMonitors(Boolean enableGradebookForMonitors) { - this.enableGradebookForMonitors = enableGradebookForMonitors; - } - public Boolean getEnableGradebookForLearners() { return enableGradebookForLearners; }