CRM-12872

diff --git a/js/Common.js b/js/Common.js
index 72a27d49729055092bca72c7ae7b40dfd0bf4573..68b06ce38d34170cb91934de71828576c863bec5 100644 (file)
--- 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');

diff --git a/templates/CRM/Contact/Form/Selector.tpl b/templates/CRM/Contact/Form/Selector.tpl
index e485efa9d9cc13ce4a7043f22089f95f02ea4d0b..393f921071e0a48bd26c37d10ddaedaca99214ad 100644 (file)
--- a/templates/CRM/Contact/Form/Selector.tpl
+++ b/templates/CRM/Contact/Form/Selector.tpl
@@ -172,9 +172,6 @@ function countSelections(obj) {
       label.prepend('<span>' + obj.getCount + '</span> ');
     }
     else {
-      if(obj.getCount > 0) {
-        cj('input[name=radio_ts][value=ts_sel]').prop('checked', true);
-      }
       cj('span', label).html(obj.getCount);
     }
     toggleTaskAction(obj.getCount);