X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2FCommon.js;h=68b06ce38d34170cb91934de71828576c863bec5;hb=3c3080c01a8ed53aea86cf96e036bf79cf26577b;hp=72a27d49729055092bca72c7ae7b40dfd0bf4573;hpb=6af65ac9741b594992fb2dd64646be95f6d5c82d;p=civicrm-core.git

diff --git a/js/Common.js b/js/Common.js
index 72a27d4972..68b06ce38d 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -452,6 +452,13 @@ CRM.validate = CRM.validate || {
   // Initialize widgets
   $(document)
     .on('crmLoad', function(e) {
+      $('table.form-layout-compressed')
+	 .on('change', 'input.select-rows', function () {
+	   if ($(this).prop('checked')) {
+	     $('input#toggleSelect:checked').prop('checked', false);
+	     $('input.select-row:checked').prop('checked', false);
+	   }
+	  })
       $('table.row-highlight', e.target)
         .off('.rowHighlight')
         .on('change.rowHighlight', 'input.select-row, input.select-rows', function (e, data) {
@@ -465,6 +472,9 @@ CRM.validate = CRM.validate || {
             if (data !== 'master-selected') {
               $('input.select-rows', $table).prop('checked', $(".select-row:not(':checked')", $table).length < 1);
             }
+	    if ($(this).prop('checked')) {
+	      $('input[value=ts_sel]:radio').prop('checked', true);
+	    }
           }
         })
         .find('input.select-row:checked').parents('tr').addClass('crm-row-selected');