CRM-20304 Add no-open class so modal stays open but doesn't open on page

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 262227ea895c2541ad775bde62b26a4f4217b353..5f299a1c815eccc3e2b116e456e0d0baffc83774 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -498,7 +498,7 @@
       settings = $el.data('popup-settings') || {},
       formData = false;
     settings.dialog = settings.dialog || {};
-    if (e.isDefaultPrevented() || !CRM.config.ajaxPopupsEnabled || !url || $el.is(exclude)) {
+    if (e.isDefaultPrevented() || !CRM.config.ajaxPopupsEnabled || !url || $el.is(exclude + ', .no-open')) {
       return;
     }
     // Sized based on css class

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 68463ef816c5bb49a4c9d4fc394bfc071ddc2b04..a1b0a7c49eea133a9fc2a3dd79c0186fb34ee97a 100644 (file)
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -157,7 +157,7 @@
       {/literal}
 
       <div class="action-link">
-          {crmButton q="reset=1&action=map&fid=$fid&gid=$gid" class="action-item" icon="sort-alpha-asc"}{ts}Alphabetize Options{/ts}{/crmButton}
+          {crmButton q="reset=1&action=map&fid=$fid&gid=$gid" class="action-item no-open" icon="sort-alpha-asc"}{ts}Alphabetize Options{/ts}{/crmButton}
           {crmButton q="reset=1&action=add&fid=$fid&gid=$gid" class="action-item" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
           {crmButton p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid" class="action-item cancel" icon="times"}{ts}Done{/ts}{/crmButton}
       </div>