From 3e1c61a7c4825f37bf8bdd228ae3dc4186f7ab76 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Wed, 9 Oct 2013 16:19:37 +0530 Subject: [PATCH] CRM-13551 : includes 'point b)' fix as well as code improvement ---------------------------------------- * CRM-13551: Fix bug in Activity Form http://issues.civicrm.org/jira/browse/CRM-13551 --- CRM/Case/XMLProcessor/Report.php | 2 +- templates/CRM/Activity/Form/Activity.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index 940315f6e0..a06b40f1b5 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -389,7 +389,7 @@ WHERE a.id = %1 ); $reporterSortName = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', - $activityDAO->source_contact_id, + $source_contact_id, 'sort_name' ); if (!array_key_exists($reporterSortName, $this->_redactionStringRules)) { diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index 92cb46bdeb..583221bc4f 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -78,7 +78,7 @@ cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' ); cj('#source_contact_id').autocomplete( sourceDataUrl, { width : 180, selectFirst : false, hintText: hintText, matchContains: true, minChars: 1, max: {/literal}{crmSetting name="search_autocomplete_count" group="Search Preferences"}{literal} }).result( function(event, data, formatted) { cj( "#source_contact_qid" ).val( data[1] ); - }).bind( 'click', function( ) { cj( "#source_contact_qid" ).val(''); }); + }).bind( 'click', function( ) { if (!cj("#source_contact_id").val()) { cj( "#source_contact_qid" ).val(''); } }); }); -- 2.25.1