From 4cda11c970d1a94c6d1d6d0337b4a36a6861bc8e Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 9 May 2014 15:13:49 -0700
Subject: [PATCH] CRM-13981 - Add missing clear-radio-selection feature for the
 Honor Type radio in Honoree block.

----------------------------------------
* CRM-13981:
  https://issues.civicrm.org/jira/browse/CRM-13981
---
 CRM/Activity/BAO/Query.php                          | 2 +-
 CRM/Contribute/Form/SoftCredit.php                  | 5 ++---
 templates/CRM/Contribute/Form/Contribution/Main.tpl | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 39dca577a9..5e0fb0ca3b 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -458,7 +458,7 @@ class CRM_Activity_BAO_Query {
     foreach ($activityStatus as $activityStatusID => $activityStatusName) {
       $activity_status[] = $form->createElement('checkbox', $activityStatusID, NULL, $activityStatusName);
     }
-    $form->addGroup($activity_status, 'activity_status', ts('Activity Status'), TRUE);
+    $form->addGroup($activity_status, 'activity_status', ts('Activity Status'));
     $form->setDefaults(array('activity_status[1]' => 1, 'activity_status[2]' => 1));
     $form->addElement('text', 'activity_subject', ts('Subject'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'sort_name'));
     $form->addYesNo('activity_test', ts('Activity is a Test?'));
diff --git a/CRM/Contribute/Form/SoftCredit.php b/CRM/Contribute/Form/SoftCredit.php
index 8df54b0c00..59f893aed0 100644
--- a/CRM/Contribute/Form/SoftCredit.php
+++ b/CRM/Contribute/Form/SoftCredit.php
@@ -88,13 +88,12 @@ class CRM_Contribute_Form_SoftCredit {
           }
 
           $softCreditTypes = CRM_Core_OptionGroup::values("soft_credit_type", FALSE);
-          $extraOption = array('onclick' => "enableHonorType();");
 
           // radio button for Honor Type
           foreach ($jsonData['soft_credit_types'] as $value) {
-            $honorTypes[$value] = $form->createElement('radio', NULL, NULL, $softCreditTypes[$value], $value, $extraOption);
+            $honorTypes[$value] = $form->createElement('radio', NULL, NULL, $softCreditTypes[$value], $value);
           }
-          $form->addGroup($honorTypes, 'soft_credit_type_id', NULL);
+          $form->addGroup($honorTypes, 'soft_credit_type_id', NULL)->setAttribute('allowClear', TRUE);
         }
       }
         return $form;
diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index f7a4add18f..0f496931a1 100644
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -346,6 +346,10 @@
   {/if}
   {literal}
 
+	cj('input[name="soft_credit_type_id"]').on('change', function() {
+		enableHonorType();
+	});
+	
   function enableHonorType( ) {
     var element = document.getElementsByName("soft_credit_type_id");
     for (var i = 0; i < element.length; i++ ) {
-- 
2.25.1