CRM-13981 - Fix options edit link for soft-credits

diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php
index 2624cd10a9c86af348dbdaa011dba51d52b9f25c..b5dad0c4a7ce0a863c6f3df7e99dd63323188a18 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Settings.php
+++ b/CRM/Contribute/Form/ContributionPage/Settings.php
@@ -205,16 +205,13 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_
 
     $this->add('textarea', 'honor_block_text', ts('Honoree Introductory Message'), array('rows' => 2, 'cols' => 50));
 
-    $softCreditTypes = &$this->add('select', 'soft_credit_types',
-      ts('Honor Types'),
-      CRM_Core_OptionGroup::values("soft_credit_type", FALSE),
-      FALSE,
-      array(
-        'id' => 'soft_credit_types',
-        'multiple' => 'multiple',
-        'class' => 'crm-select2',
-      )
-    );
+    $this->addSelect('soft_credit_types', array(
+      'label' => ts('Honor Types'),
+      'entity' => 'ContributionSoft',
+      'field' => 'soft_credit_type_id',
+      'multiple' => TRUE,
+      'class' => 'huge'
+    ));
 
     $entities = array(
       array(

diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
index 7a9d6daabc0c82a7d713c27fc82c3d8c5e0f7b3d..d7ebb4e068d38baa6c3eae173da3c1225104953e 100644 (file)
--- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
@@ -138,12 +138,7 @@
           {$form.soft_credit_types.label}
       </td>
       <td>
-          <dt style="text-align:left;">{$form.soft_credit_types.html|crmAddClass:huge}</dt>
-          <dd>
-              <a class="optionvalue-link" href="#" title='Click to edit available soft credit types'>
-                  <span class="batch-edit"></span>
-              </a>
-          </dd>
+        {$form.soft_credit_types.html}
       </td>
   </tr>
   <tr class="crm-contribution-contributionpage-custom-form-block-custom_pre_id">
@@ -211,17 +206,6 @@
             document.getElementById("honor").style.display = "none";
         }
      }
-     cj('.optionvalue-link').click(function() {
-        {/literal}"{crmAPI var='result' entity='OptionGroup' action='get' sequential=1 name='soft_credit_type'}"{literal};
-        var postURL = {/literal}"{crmURL p='civicrm/admin/options' q="gid="}{$result.id}"{literal};
-        CRM.loadForm(postURL).on('crmFormSuccess', function(e, data) {
-           cj('.ui-dialog a').click(function(){
-           //Todo: inline edit facility for soft_credit_type option group in jquery popup dialog
-           });
-        });
-      return false;
-    })
-
  {/literal}
 </script>