Fix issues with select2 validation when it is part of hidden 'On beha…

…lf of organisation' block
civicrm · Jun 20, 2020 · 2ee6dbf · 2ee6dbf
1 parent 64b2d47
commit 2ee6dbf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -54,12 +54,23 @@
     selectCreateOrg(orgOption, false);
 
     if (is_for_organization.length) {
-      $('#on-behalf-block').toggle(is_for_organization.is(':checked'));
+      showHideOnBehalfOfBlock();
+
+      is_for_organization.on('change', function() {
+        showHideOnBehalfOfBlock();
+      });
     }
 
-    is_for_organization.on('change', function(){
-      $('#on-behalf-block').toggle($(this).is(':checked'));
-    });
+    function showHideOnBehalfOfBlock() {
+      $('#on-behalf-block').toggle(is_for_organization.is(':checked'));
+
+      if (is_for_organization.is(':checked')) {
+        $('#onBehalfOfOrg select.crm-select2').removeClass('crm-no-validate');
+      }
+      else {
+        $('#onBehalfOfOrg select.crm-select2').addClass('crm-no-validate');
+      }
+    }
 
     $("input:radio[name='org_option']").click( function( ) {
       var orgOption = $(this).attr('id');

diff --git a/templates/CRM/common/l10n.js.tpl b/templates/CRM/common/l10n.js.tpl
@@ -95,7 +95,7 @@
   var params = {
     errorClass: 'crm-inline-error alert-danger',
     messages: {},
-    ignore: ".select2-offscreen, [readonly], :hidden:not(.crm-select2)",
+    ignore: '.select2-offscreen, [readonly], :hidden:not(.crm-select2), .crm-no-validate'
     ignoreTitle: true
   };