From b50fdaccade9cb52d5e5410c26b0aaf1920c950b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 20 Aug 2014 20:37:10 +0100
Subject: [PATCH] CRM-15153 - Give forms a unique css class based on full class
 name

---
 CRM/Core/Form.php                                          | 5 +++++
 templates/CRM/Activity/Form/Search.tpl                     | 3 ++-
 templates/CRM/Activity/Form/Task/FileOnCase.tpl            | 2 +-
 templates/CRM/Admin/Form/Setting/Mapping.tpl               | 5 +++--
 templates/CRM/Batch/Form/Entry.tpl                         | 3 ++-
 templates/CRM/Campaign/Form/Gotv.tpl                       | 2 +-
 templates/CRM/Case/Form/Activity/LinkCases.tpl             | 2 +-
 templates/CRM/Contact/Form/Contact.tpl                     | 2 +-
 templates/CRM/Contact/Form/Inline/Address.tpl              | 4 ++--
 templates/CRM/Contact/Form/Relationship.tpl                | 2 +-
 templates/CRM/Contact/Form/Task/Email.tpl                  | 2 +-
 templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl        | 2 +-
 templates/CRM/Contribute/Form/Contribution.tpl             | 2 +-
 templates/CRM/Contribute/Form/SoftCredit.tpl               | 2 +-
 templates/CRM/Core/I18n/Form.tpl                           | 5 +++--
 templates/CRM/Event/Form/ManageEvent/EventInfo.tpl         | 3 ++-
 templates/CRM/Event/Form/Participant.tpl                   | 4 ++--
 templates/CRM/Event/Form/ParticipantFeeSelection.tpl       | 3 ++-
 .../CRM/Event/Form/Registration/AdditionalParticipant.tpl  | 2 +-
 templates/CRM/Form/attachment.tpl                          | 2 +-
 templates/CRM/Form/validate.tpl                            | 4 ++--
 templates/CRM/Mailing/Form/InsertTokens.tpl                | 4 ++--
 templates/CRM/Member/Form/Membership.tpl                   | 4 ++--
 templates/CRM/Pledge/Form/Pledge.tpl                       | 2 +-
 templates/CRM/SMS/Form/Provider.tpl                        | 2 +-
 templates/CRM/Tag/Form/Tag.tpl                             | 7 ++++---
 templates/CRM/common/pager.tpl                             | 6 +++---
 27 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 7307c84c3a..3fa2bed56f 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -170,6 +170,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
       $this->_name = $name;
     }
     else {
+      // CRM-15153 - FIXME this name translates to a DOM id and is not always unique!
       $this->_name = CRM_Utils_String::getClassName(CRM_Utils_System::getClassName($this));
     }
 
@@ -187,6 +188,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
     if (!isset(self::$_template)) {
       self::$_template = CRM_Core_Smarty::singleton();
     }
+    // Workaround for CRM-15153 - give each form a reasonably unique css class
+    $this->addClass(CRM_Utils_System::getClassName($this));
 
     $this->assign('snippet', CRM_Utils_Array::value('snippet', $_GET));
   }
@@ -646,6 +649,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
     $this->accept($renderer);
     $content = $renderer->toArray();
     $content['formName'] = $this->getName();
+    // CRM-15153
+    $content['formClass'] = CRM_Utils_System::getClassName($this);
     return $content;
   }
 
diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl
index c0fe4cbecc..fee095679f 100644
--- a/templates/CRM/Activity/Form/Search.tpl
+++ b/templates/CRM/Activity/Form/Search.tpl
@@ -88,7 +88,8 @@
 {literal}
   <script type="text/javascript">
     CRM.$(function($) {
-      var roleId = $('input[name=activity_role]:checked', '#Search').val();
+      var $form = $('form.{/literal}{$form.formClass}{literal}'),
+        roleId = $('input[name=activity_role]:checked', $form).val();
       if (roleId) {
         $('.description .option-' + roleId).show();
       }
diff --git a/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/templates/CRM/Activity/Form/Task/FileOnCase.tpl
index 6049c453bc..ae3ae07e55 100644
--- a/templates/CRM/Activity/Form/Task/FileOnCase.tpl
+++ b/templates/CRM/Activity/Form/Task/FileOnCase.tpl
@@ -46,7 +46,7 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  var $form = $("#{/literal}{$form.formName}{literal}");
+  var $form = $("form.{/literal}{$form.formClass}{literal}");
   $('input[name=unclosed_case_id]', $form).crmSelect2({
     placeholder: {/literal}'{ts escape="js"}- select case -{/ts}'{literal},
     minimumInputLength: 1,
diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl
index b48a52d6cc..126af32277 100644
--- a/templates/CRM/Admin/Form/Setting/Mapping.tpl
+++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl
@@ -55,12 +55,13 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
+  var $form = $('form.{/literal}{$form.formClass}{literal}');
   function showHideMapAPIkey() {
     var mapProvider = $(this).val();
     if ( !mapProvider || ( mapProvider === 'OpenStreetMaps' ) ) {
-      $('#Mapping tr.crm-map-form-block-mapAPIKey').hide( );
+      $('tr.crm-map-form-block-mapAPIKey', $form).hide( );
     } else {
-      $('#Mapping tr.crm-map-form-block-mapAPIKey').show( );
+      $('tr.crm-map-form-block-mapAPIKey', $form).show( );
     }
   }
   $('#mapProvider').each(showHideMapAPIkey).change(showHideMapAPIkey);
diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index a3bb2a852b..f474ac0c37 100644
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -107,12 +107,13 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
+  var $form = $('form.{/literal}{$form.formClass}{literal}');
   $('.selector-rows').change(function () {
     var options = {
       'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
     };
 
-    $("#Entry").ajaxSubmit(options);
+    $($form).ajaxSubmit(options);
   });
 
   $('#crm-container').on('keyup change', '*.selector-rows', function () {
diff --git a/templates/CRM/Campaign/Form/Gotv.tpl b/templates/CRM/Campaign/Form/Gotv.tpl
index 6db4c0979c..0d878054e2 100755
--- a/templates/CRM/Campaign/Form/Gotv.tpl
+++ b/templates/CRM/Campaign/Form/Gotv.tpl
@@ -120,7 +120,7 @@ function loadVoterList( )
      var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=voterList' }"{literal};
 
      var searchVoterFor = {/literal}'{$searchVoterFor}'{literal};
-     CRM.$( 'table.gotvVoterRecords', 'form#{/literal}{$form.formName}{literal}').dataTable({
+     CRM.$( 'table.gotvVoterRecords', 'form.{/literal}{$form.formClass}{literal}').dataTable({
                "bFilter"    : false,
     "bAutoWidth" : false,
         "bProcessing": true,
diff --git a/templates/CRM/Case/Form/Activity/LinkCases.tpl b/templates/CRM/Case/Form/Activity/LinkCases.tpl
index 4d7217f735..3ba4dbeeae 100644
--- a/templates/CRM/Case/Form/Activity/LinkCases.tpl
+++ b/templates/CRM/Case/Form/Activity/LinkCases.tpl
@@ -33,7 +33,7 @@
 {literal}
 <script type="text/javascript">
   CRM.$(function($) {
-    var $form = $("#{/literal}{$form.formName}{literal}");
+    var $form = $("form.{/literal}{$form.formClass}{literal}");
     $('input[name=link_to_case_id]', $form).crmSelect2({
       placeholder: {/literal}'{ts escape="js"}- select case -{/ts}'{literal},
       minimumInputLength: 1,
diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index 732830e129..22b7acbde2 100644
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -108,7 +108,7 @@
 
   <script type="text/javascript" >
   CRM.$(function($) {
-    var $form = $("#{/literal}{$form.formName}{literal}");
+    var $form = $("form.{/literal}{$form.formClass}{literal}");
     var action = "{/literal}{$action}{literal}";
 
     $('.crm-accordion-body').each( function() {
diff --git a/templates/CRM/Contact/Form/Inline/Address.tpl b/templates/CRM/Contact/Form/Inline/Address.tpl
index 7eeca293e6..ff6a3ca3f0 100644
--- a/templates/CRM/Contact/Form/Inline/Address.tpl
+++ b/templates/CRM/Contact/Form/Inline/Address.tpl
@@ -94,14 +94,14 @@
     }
   });
   {/literal}{* // Enforce unique is_primary fields *}{literal}
-  cj(':checkbox[id*="[is_primary"]', 'form#Address_{/literal}{$blockId}{literal}').change(function() {
+  cj(':checkbox[id*="[is_primary"]', 'form[name=Address_{/literal}{$blockId}{literal}]').change(function() {
     if (this.defaultChecked) {
       cj(this).crmError("{/literal} {ts escape='js'}Please choose another address to be primary before changing this one.{/ts}{literal}");
       cj(this).prop('checked', true);
     }
   });
   {/literal}{* // Reset location_type_id when cancel button pressed *}{literal}
-  cj(':submit[name$=cancel]', 'form#Address_{/literal}{$blockId}{literal}').click(function() {
+  cj(':submit[name$=cancel]', 'form[name=Address_{/literal}{$blockId}{literal}]').click(function() {
     var container = cj(this).closest('div.crm-inline-edit.address');
     var origValue = container.attr('data-location-type-id') || '';
     container.data('location-type-id', origValue);
diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index 9a234f6f0b..4524998ce0 100644
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -145,7 +145,7 @@
       {literal}
       CRM.$(function($) {
         var
-          $form = $("form#{/literal}{$form.formName}{literal}"),
+          $form = $("form.{/literal}{$form.formClass}{literal}"),
           relationshipData = {/literal}{$relationshipData|@json_encode}{literal};
         $('[name=relationship_type_id]', $form).change(function() {
           var
diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index acaf141d36..24b7aaf1fa 100644
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -97,7 +97,7 @@
 
 {literal}
 CRM.$(function($) {
-  var $form = $("#{/literal}{$form.formName}{literal}");
+  var $form = $("form.{/literal}{$form.formClass}{literal}");
 
   $('.add-cc-link', $form).click(function(e) {
     e.preventDefault();
diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index 1fbf89818f..64a9a2f155 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -122,7 +122,7 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  var $form = $('form#{/literal}{$form.formName}{literal}');
+  var $form = $('form.{/literal}{$form.formClass}{literal}');
   $('#format_id', $form).on('change', function() {
     selectFormat($(this).val());
   });
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 9726b629fa..dbde692575 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -391,7 +391,7 @@
       {literal}
       CRM.$(function($) {
 
-        var $form = $("#{/literal}{$form.formName}{literal}");
+        var $form = $("form.{/literal}{$form.formClass}{literal}");
         $("#contact_id", $form).change(checkEmail);
         checkEmail( );
 
diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl
index b9e762e6f9..71dc72fdea 100644
--- a/templates/CRM/Contribute/Form/SoftCredit.tpl
+++ b/templates/CRM/Contribute/Form/SoftCredit.tpl
@@ -67,7 +67,7 @@
 {literal}
 <script type="text/javascript">
   CRM.$(function($) {
-    var $form = $("#{/literal}{$form.formName}{literal}");
+    var $form = $("form.{/literal}{$form.formClass}{literal}");
     $('#showPCP, #showSoftCredit').click(function(){
       return showHideSoftCreditAndPCP();
     });
diff --git a/templates/CRM/Core/I18n/Form.tpl b/templates/CRM/Core/I18n/Form.tpl
index 68f53f6e16..1749dab10c 100644
--- a/templates/CRM/Core/I18n/Form.tpl
+++ b/templates/CRM/Core/I18n/Form.tpl
@@ -41,11 +41,12 @@
 <script type="text/javascript">
 var fieldName = "{/literal}{$field}{literal}";
 var tsLocale = "{/literal}{$tsLocale}{literal}";
-cj('#Form').submit(function() {
+var $form = $('form.{/literal}{$form.formClass}{literal}');
+cj($form).submit(function() {
       cj(this).ajaxSubmit({
                             beforeSubmit: function (formData, jqForm, options) {
                                                     var queryString = cj.param(formData);
-                                                    var postUrl     = cj('#Form').attr('action');
+                                                    var postUrl     = cj($form).attr('action');
                                                     cj.ajax({
                                                              type   : "POST",
                                                              url    : postUrl,
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index a1980b18f7..f180f7bf0e 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -178,7 +178,8 @@
 {literal}
 <script type="text/javascript">
   CRM.$(function($) {
-    $('#template_id', '#EventInfo').change(function() {
+    var $form = $('form.{/literal}{$form.formClass}{literal}');
+    $('#template_id', $form).change(function() {
       $('#crm-main-content-wrapper')
         .crmSnippet({url: CRM.url('civicrm/event/add', {action: 'add', reset: 1, template_id: $(this).val()})})
         .crmSnippet('refresh');
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index e762821956..f04d976a2f 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -151,7 +151,7 @@
     }
   );
 
-  cj('#Participant').on("click",'.validate',
+  cj('form[name=Participant]').on("click", '.validate',
     function(e) {
       var userSubmittedStatus = cj('#status_id').val();
       var statusLabel = cj('#status_id option:selected').text();
@@ -338,7 +338,7 @@
       {literal}
       CRM.$(function($) {
 
-        var $form = $('form#{/literal}{$form.formName}{literal}');
+        var $form = $('form.{/literal}{$form.formClass}{literal}');
 
         // don't show cart related statuses if it's disabled
         {/literal}{if !$enableCart}{literal}
diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 50f84fb49c..60f0b9044f 100644
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -199,9 +199,10 @@ CRM.$(function($) {
 {literal}
 <script type='text/javascript'>
 CRM.$(function($) {
+  var $form = $('form.{/literal}{$form.formClass}{literal}');
   cj('.total_amount-section').remove(); 
 
-  cj('#ParticipantFeeSelection').submit(function(e) {
+  cj($form).submit(function(e) {
     var partiallyPaid = {/literal}{$partiallyPaid}{literal};
     var pendingRefund = {/literal}{$pendingRefund}{literal};
     var statusId = cj('#status_id').val();
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index 147ece88a0..1e254c4de6 100644
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -79,7 +79,7 @@
 
 function allowGroupOnWaitlist( participantCount, currentCount )
 {
-  var formId          = {/literal}'{$formId}'{literal};
+  var formId          = {/literal}'{$formName}'{literal};
   var waitingMsg      = {/literal}'{$waitingMsg}'{literal};
   var confirmedMsg    = {/literal}'{$confirmedMsg}'{literal};
   var paymentBypassed = {/literal}'{$paymentBypassed}'{literal};
diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index a15368d324..f95f59ec8d 100644
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -130,7 +130,7 @@
     {literal}
     <script type="text/javascript">
       CRM.$(function($) {
-        var $form = $("#{/literal}{$form.formName}{literal}");
+        var $form = $("form.{/literal}{$form.formClass}{literal}");
         $form
           .on('click', '.crm-clear-attachment', function(e) {
             e.preventDefault();
diff --git a/templates/CRM/Form/validate.tpl b/templates/CRM/Form/validate.tpl
index 852a2b7c21..117867892f 100644
--- a/templates/CRM/Form/validate.tpl
+++ b/templates/CRM/Form/validate.tpl
@@ -25,12 +25,12 @@
 *}
 {* Initialize jQuery validate on a form *}
 {* Extra params and functions may be added to the CRM.validate object before this template is loaded *}
-{if !$crm_form_validate_included and $smarty.get.snippet neq 'json' and $form and $form.formName}
+{if !$crm_form_validate_included and $smarty.get.snippet neq 'json' and $form and $form.formClass}
   {assign var=crm_form_validate_included value=1}
   {literal}
   <script type="text/javascript">
     CRM.$(function($) {
-      $("#{/literal}{$form.formName}{literal}").crmValidate();
+      $("form.{/literal}{$form.formClass}{literal}").crmValidate();
     });
   </script>
   {/literal}
diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index cf5ebcd07c..9e6129463c 100644
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -29,7 +29,7 @@
 <script type="text/javascript" src="{$config->resourceBase}packages/jquery/plugins/jquery-fieldselection.js"></script>
 
 <script type="text/javascript">
-cj('form#{$form.formName}').data('tokens', {$tokens|@json_encode});
+cj('form.{$form.formClass}').data('tokens', {$tokens|@json_encode});
 var text_message = null;
 var html_message = null;
 var isPDF        = false;
@@ -352,7 +352,7 @@ CRM.$(function($) {
   }
 
   // Initialize token selector widgets
-  var form = $('#{/literal}{$form.formName}{literal}');
+  var form = $('form.{/literal}{$form.formClass}{literal}');
   $('input.crm-token-selector', form)
     .addClass('crm-action-menu')
     .change(insertToken)
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 0ff485622c..bc88ff4c1a 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -464,7 +464,7 @@
     {if $context eq 'standalone' and $outBound_option != 2 }
     {literal}
     CRM.$(function($) {
-      var $form = $("#{/literal}{$form.formName}{literal}");
+      var $form = $("form.{/literal}{$form.formClass}{literal}");
       $("#contact_id", $form).change(checkEmail);
       checkEmail( );
 
@@ -489,7 +489,7 @@
     {literal}
     //keep read only always checked.
     CRM.$(function($) {
-      var $form = $("#{/literal}{$form.formName}{literal}");
+      var $form = $("form.{/literal}{$form.formClass}{literal}");
       var allowAutoRenew   = {/literal}'{$allowAutoRenew}'{literal};
       var alreadyAutoRenew = {/literal}'{$alreadyAutoRenew}'{literal};
       if ( allowAutoRenew || alreadyAutoRenew ) {
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 959321c541..0a390d443c 100644
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -237,7 +237,7 @@ function loadPanes( id ) {
     {if $context eq 'standalone' and $outBound_option != 2 }
     {literal}
     CRM.$(function($) {
-      var $form = $("#{/literal}{$form.formName}{literal}");
+      var $form = $("form.{/literal}{$form.formClass}{literal}");
       $("#contact_id", $form).change(checkEmail);
       checkEmail( );
 
diff --git a/templates/CRM/SMS/Form/Provider.tpl b/templates/CRM/SMS/Form/Provider.tpl
index 6b0cc328ec..857130447f 100644
--- a/templates/CRM/SMS/Form/Provider.tpl
+++ b/templates/CRM/SMS/Form/Provider.tpl
@@ -77,7 +77,7 @@
 <script type="text/javascript" >
 {literal}
   CRM.$(function($) {
-    var $form = $("#{/literal}{$form.formName}{literal}");
+    var $form = $("form.{/literal}{$form.formClass}{literal}");
     $('select[name=name]', $form).change(function() {
       var url = {/literal}"{$refreshURL}"{literal} + "&key=" + this.value;
       $(this).closest('.crm-ajax-container, #crm-main-content-wrapper').crmSnippet({url: url}).crmSnippet('refresh');
diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl
index 9dca5a9c27..52af9c8d3f 100644
--- a/templates/CRM/Tag/Form/Tag.tpl
+++ b/templates/CRM/Tag/Form/Tag.tpl
@@ -38,8 +38,9 @@
 </style>
 <script type="text/javascript">
   (function($, _){{/literal}
-    var entityID={$entityID};
-    var entityTable='{$entityTable}';
+    var entityID={$entityID},
+      entityTable='{$entityTable}',
+      $form = $('form.{$form.formClass}');
     {literal}
     CRM.updateContactSummaryTags = function() {
       var tags = [];
@@ -51,7 +52,7 @@
         tags = tags.concat(setTags);
       });
       // contact summary tabs and search forms both listen for this event
-      $('#Tag').closest('.crm-ajax-container').trigger('crmFormSuccess', {tabCount: tags.length});
+      $($form).closest('.crm-ajax-container').trigger('crmFormSuccess', {tabCount: tags.length});
       // update summary tab
       $("#contact-summary #tags").html(tags.join(', '));
     };
diff --git a/templates/CRM/common/pager.tpl b/templates/CRM/common/pager.tpl
index 744d084c59..4f56256b2d 100644
--- a/templates/CRM/common/pager.tpl
+++ b/templates/CRM/common/pager.tpl
@@ -48,8 +48,8 @@
     {* Controller for 'Rows Per Page' *}
     {if $location eq 'bottom' and $pager->_totalItems > 25}
      <div class="form-item float-right">
-       <label for="{$form.formName}-rows-per-page-select">{ts}Rows per page:{/ts}</label> &nbsp;
-       <input class="crm-rows-per-page-select" id="{$form.formName}-rows-per-page-select" type="text" size="3" value="{$pager->_perPage}"/>
+       <label for="{$form.formClass}-rows-per-page-select">{ts}Rows per page:{/ts}</label> &nbsp;
+       <input class="crm-rows-per-page-select" id="{$form.formClass}-rows-per-page-select" type="text" size="3" value="{$pager->_perPage}"/>
      </div>
      <div class="clear"></div>
     {/if}
@@ -60,7 +60,7 @@
         CRM.$(function($) {
           {/literal}
           var
-            $form = $('#{$form.formName}'),
+            $form = $('form.{$form.formClass}'),
             numPages = {$pager->_response.numPages},
             currentPage = {$pager->_response.currentPage},
             perPageCount = {$pager->_perPage},
-- 
2.25.1