clean up (CRM-13205)

diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php
index 561b7fa61e3dc15dca1a5d21bd9ad9b538708552..40ba152c6d18536f75dcff7c4d9053dd587efd54 100644 (file)
--- a/CRM/Activity/Form/Search.php
+++ b/CRM/Activity/Form/Search.php
@@ -439,9 +439,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form {
     if ($signupType) {
       //$this->_formValues['activity_type_id'] = array();
       $this->_formValues['activity_role'] = 1;
-      $this->_formValues['activity_contact_name'] = '';
       $this->_defaults['activity_role'] = 1;
-      $this->_defaults['activity_contact_name'] = '';
       $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, FALSE, FALSE, 'name');
 
       $renew = CRM_Utils_Array::key('Membership Renewal', $activityTypes);

diff --git a/CRM/Activity/Page/UserDashboard.php b/CRM/Activity/Page/UserDashboard.php
index bdc1fda2ac00a355b35380d2ff8958f3f04b755c..6620bac8d9377f5144aa2ce63e969ab9f349b495 100644 (file)
--- a/CRM/Activity/Page/UserDashboard.php
+++ b/CRM/Activity/Page/UserDashboard.php
@@ -53,7 +53,6 @@ class CRM_Activity_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBoar
     $controller->set('cid', $this->_contactId);
     $controller->set('status', array(1 => 'on'));
     $controller->set('activity_role', 2);
-    $controller->set('activity_contact_name', 'd6');
     $controller->set('force', 1);
     $controller->process();
     $controller->run();

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index a74d2d81d8b70c83baf24855e62be109c2fbc852..303d130dc01fee0854f9a723ee0c8aa8ff4d5f54 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1645,7 +1645,6 @@ class CRM_Contact_BAO_Query {
       case 'activity_tags':
       case 'activity_taglist':
       case 'activity_test':
-      case 'activity_contact_name':
       case 'activity_campaign_id':
       case 'activity_engagement_level':
       case 'activity_id':

diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl
index 10b72df776151bc9943dd34a104d2352f90fad99..4d256f02b568977f9e1dcea3a0d46b830c2e6b96 100644 (file)
--- a/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/templates/CRM/Activity/Form/Search/Common.tpl
@@ -73,12 +73,12 @@
     <span class="crm-clear-link">
       (<a href="#" title="unselect"
           onclick="unselectRadio('activity_role', '{$form.formName}');
-            cj('#activity_contact_name').val('').parent().hide(); return false;" >
+            return false;">
         {ts}clear{/ts}
       </a>)
     </span>
+
     <div>
-    {$form.activity_contact_name.html}
       <div class="description font-italic">{ts}Complete OR partial name{/ts}
         <span class="contact-name-option option-1">{ts} of the Source Contact{/ts}</span>
         <span class="contact-name-option option-2">{ts} of the Assignee Contact{/ts}</span>
@@ -162,15 +162,10 @@ campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''}
 cj('[name=activity_role]:input').change(function() {
   cj('.description .contact-name-option').hide();
   if (cj(this).is(':checked')) {
-    cj('#activity_contact_name').parent().show();
     cj('.description .option-' + cj(this).val()).show();
   }
 }).change();
 
-if (cj('[name=activity_role]:checked').length < 1) {
-  cj('#activity_contact_name').parent().hide();
-}
-
 function showCustomData(chkbox) {
   if (document.getElementById(chkbox).checked) {
     //inject Searchable activity custom fields according to activity type selected