SAK-40622 - Private Messages; Check All doesn't select any message (s…

…akaiproject#6031)
JackyCheungBoy · Sep 24, 2018 · 42fea1c · 42fea1c
1 parent dba0497
commit 42fea1c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/js/forum.js b/msgcntr/messageforums-app/src/webapp/js/forum.js
@@ -888,6 +888,25 @@ $(document).ready(function(){
 
 });
 
+$(document).ready(function(){
+    $("#prefs_pvt_form\\:pvtmsgs\\:checkAll, #prefs_pvt_form\\:threaded_pvtmsgs\\:checkAll").click(function () {
+        $('input:checkbox').not(this).prop('checked', this.checked);
+        if(this.checked){
+            toggleBulkOperations(true, 'prefs_pvt_form');
+        }else{
+            toggleBulkOperations(false, 'prefs_pvt_form');
+        }
+    });
+    $("#prefs_form_search\\:pvtmsgs\\:checkAll, #prefs_form_search\\:threaded_pvtmsgs\\:checkAll").click(function () {
+        $('input:checkbox').not(this).prop('checked', this.checked);
+        if(this.checked){
+            toggleBulkOperations(true, 'prefs_form_search');
+        }else{
+            toggleBulkOperations(false, 'prefs_form_search');
+        }
+    });
+});
+
 // rubrics-specific code
 var rubricChanged = false;
 rubricsEventHandlers = function () {

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp
@@ -59,8 +59,9 @@
 
 		  <h:column>
 		    <f:facet name="header">
- 					<h:commandLink action="#{PrivateMessagesTool.processCheckAll}" value="#{msgs.cdfm_checkall}" 
- 					               title="#{msgs.cdfm_checkall}" />
+					<h:selectBooleanCheckbox id="checkAll" title="#{msgs.cdfm_checkall}">
+						<h:outputText value="#{msgs.cdfm_checkall} "/>
+					</h:selectBooleanCheckbox>
 		    </f:facet>
 				<h:selectBooleanCheckbox value="#{rcvdItems.isSelected}" onclick="updateCount(this.checked); toggleBulkOperations(anyChecked(), 'prefs_pvt_form');" />
 		  </h:column>
@@ -191,9 +192,9 @@
 								 columnClasses="attach,attach,attack,specialLink,bogus,bogus,bogus">
 		 	<h:column>
 		    <f:facet name="header">
- 					<h:commandLink action="#{PrivateMessagesTool.processCheckAll}" value="#{msgs.cdfm_checkall}" 
- 					               title="#{msgs.cdfm_checkall}"/>
-		     <%--<h:commandButton alt="SelectAll" image="/messageforums-tool/images/checkbox.gif" action="#{PrivateMessagesTool.processSelectAllJobs}"/>--%>
+				<h:selectBooleanCheckbox id="checkAll" title="#{msgs.cdfm_checkall}">
+					<h:outputText value="#{msgs.cdfm_checkall} "/>
+				</h:selectBooleanCheckbox>
 		    </f:facet>
 				<h:selectBooleanCheckbox value="#{rcvdItems.isSelected}" onclick="updateCount(this.checked); toggleBulkOperations(anyChecked(), 'prefs_pvt_form');" />
 		  </h:column>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp
@@ -25,9 +25,9 @@
 	  	rendered="#{PrivateMessagesTool.selectView != 'threaded'}" columnClasses="attach,attach,specialLink,bogus,bogus,bogus">   
 		  <h:column>
 		    <f:facet name="header">
- 					<h:commandLink action="#{PrivateMessagesTool.processCheckAll}" value="#{msgs.cdfm_checkall}" 
- 					               title="#{msgs.cdfm_checkall}" />
-		     <%--<h:commandButton alt="SelectAll" image="/messageforums-tool/images/checkbox.gif" action="#{PrivateMessagesTool.processSelectAllJobs}"/>--%>
+				<h:selectBooleanCheckbox id="checkAll" title="#{msgs.cdfm_checkall}">
+					<h:outputText value="#{msgs.cdfm_checkall} "/>
+				</h:selectBooleanCheckbox>
 		    </f:facet>
 				<h:selectBooleanCheckbox value="#{rcvdItems.isSelected}" onclick="updateCount(this.checked); toggleBulkOperations(anyChecked(), 'prefs_form_search');" />
 		  </h:column>
@@ -90,8 +90,9 @@
 	  	columnClasses="attach,attach,specialLink,bogus,bogus,bogus">
 		  <h:column>
 		    <f:facet name="header">
-		    	<h:commandLink action="#{PrivateMessagesTool.processCheckAll}" value="#{msgs.cdfm_checkall}" 
- 					               title="#{msgs.cdfm_checkall}" />
+				<h:selectBooleanCheckbox id="checkAll" title="#{msgs.cdfm_checkall}">
+					<h:outputText value="#{msgs.cdfm_checkall} "/>
+				</h:selectBooleanCheckbox>
 		    </f:facet>
 		    <h:selectBooleanCheckbox value="#{rcvdItems.isSelected}" onclick="updateCount(this.checked); toggleBulkOperations(anyChecked(), 'prefs_form_search');" />
 		  </h:column>