Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/createOrEdit.jsp,v
diff -u -r1.5.2.8 -r1.5.2.9
--- lams_admin/web/organisation/createOrEdit.jsp	4 May 2017 04:14:17 -0000	1.5.2.8
+++ lams_admin/web/organisation/createOrEdit.jsp	8 May 2017 01:29:19 -0000	1.5.2.9
@@ -1,21 +1,5 @@
 <%@ include file="/taglibs.jsp"%>
 
-<script type="text/javascript">
-	function selectMonitorGradebook() {
-		document.getElementById("enableGradebookForMonitors").checked = true;
-	}
-	
-	function unSelectLearnerGradebook() {
-		var mon = document.getElementById("enableGradebookForMonitors");
-		var lrn = document.getElementById("enableGradebookForLearners");
-		
-		if (lrn.checked) {
-			lrn.checked = mon.checked;
-		}
-	}
-
-</script>
-
 <html-el:form action="/orgsave.do" method="post">
 <html-el:hidden property="orgId" />
 <html-el:hidden property="parentId" />
@@ -111,7 +95,7 @@
 		</div>
 		<div class="checkbox">
 			<label for="enableGradebookForLearners">
-			<html-el:checkbox onclick="selectMonitorGradebook();" styleId="enableGradebookForLearners" property="enableGradebookForLearners" />
+			<html-el:checkbox styleId="enableGradebookForLearners" property="enableGradebookForLearners" />
 				<fmt:message key="admin.gradebook.learner.enable"/>
 			</label>
 		</div>
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.123 -r1.420.2.124
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.22.2.7 -r1.22.2.8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	4 May 2017 04:10:39 -0000	1.22.2.7
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	8 May 2017 01:35:27 -0000	1.22.2.8
@@ -100,16 +100,6 @@
 			</meta>
 		</property>
 
-		<!--  enableGradebookForMonitors is no longer used - will always return true in the code  -->
-		<property name="enableGradebookForMonitors" type="java.lang.Boolean"
-			column="enable_monitor_gradebook" not-null="true" length="1">
-			<meta attribute="field-description">
-				@hibernate.property
-				column="enable_monitor_gradebook"
-				length="1" not-null="true"
-			</meta>
-		</property>
-
 		<property name="enableGradebookForLearners" type="java.lang.Boolean"
 			column="enable_learner_gradebook" not-null="true" length="1">
 			<meta attribute="field-description">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v
diff -u -r1.24.2.6 -r1.24.2.7
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	4 May 2017 04:10:39 -0000	1.24.2.6
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	8 May 2017 01:35:27 -0000	1.24.2.7
@@ -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;
     }