From fc791e9002b49f7f69c1e315ae69a5eba7dbd31e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 11 Feb 2014 16:49:17 -0800
Subject: [PATCH] CRM-13966 - Refactor member org autocomplete

---
 CRM/Member/Form/MembershipType.php           | 23 ++----------
 templates/CRM/Member/Form/MembershipType.tpl | 38 ++------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index b24043531f..01d4739e3e 100644
--- a/CRM/Member/Form/MembershipType.php
+++ b/CRM/Member/Form/MembershipType.php
@@ -66,11 +66,6 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
   public function setDefaultValues() {
     $defaults = parent::setDefaultValues();
 
-    // get the member org display name
-    if ( $this->_id && !empty($defaults['member_of_contact_id'])) {
-      $this->assign('member_org_id', $defaults['member_of_contact_id']);
-    }
-
     //finding default weight to be put
     if (!isset($defaults['weight']) || (!$defaults['weight'])) {
       $defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Member_DAO_MembershipType');
@@ -146,18 +141,8 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
       CRM_Core_DAO::getAttribute('CRM_Member_DAO_MembershipType', 'duration_interval')
     );
 
-    $dataUrl = CRM_Utils_System::url(
-      "civicrm/ajax/rest",
-      "className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=membershipType&reset=1&org=1",
-      FALSE, NULL, FALSE
-    );
-    $this->assign('dataUrl', $dataUrl);
-
-    $memberOrg = &$this->add('text', 'member_of_contact', ts('Membership Organization'), NULL, TRUE);
-    $this->add('hidden', 'member_of_contact_id', '', array('id' => 'member_of_contact_id'));
-    if ($memberOrg->getValue()) {
-      $this->assign('member_org', $memberOrg->getValue());
-    }
+    $props = array('api' => array('params' => array('contact_type' => 'Organization')));
+    $this->addEntityRef('member_of_contact_id', ts('Membership Organization'), $props, TRUE);
 
     //start day
     $this->add('date', 'fixed_period_start_day', ts('Fixed Period Start Day'),
@@ -239,10 +224,6 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
       $errors['name'] = ts('Please enter a membership type name.');
     }
 
-    if ($params['member_of_contact'] && !is_numeric($params['member_of_contact_id'])) {
-      $errors['member_of_contact'] = ts('Please select valid organization contact.');
-    }
-
     if (empty( $params['financial_type_id'] ) ) {
       $errors['financial_type_id'] = ts('Please enter a financial type.');
     }
diff --git a/templates/CRM/Member/Form/MembershipType.tpl b/templates/CRM/Member/Form/MembershipType.tpl
index 9217e5b326..7204cd10a1 100644
--- a/templates/CRM/Member/Form/MembershipType.tpl
+++ b/templates/CRM/Member/Form/MembershipType.tpl
@@ -52,8 +52,8 @@
       </tr>
 
       <tr class="crm-membership-type-form-block-member_org">
-        <td class="label">{$form.member_of_contact.label}</td>
-        <td><label>{$form.member_of_contact.html}</label><br />
+        <td class="label">{$form.member_of_contact_id.label}</td>
+        <td>{$form.member_of_contact_id.html}<br />
           <span class="description">{ts}Members assigned this membership type belong to which organization (e.g. this is for membership in 'Save the Whales - Northwest Chapter'). NOTE: This organization/group/chapter must exist as a CiviCRM Organization type contact.{/ts}</span>
         </td>
       </tr>
@@ -160,40 +160,6 @@
 {literal}
 <script type="text/javascript">
 cj(function(){
-  // start of member org autocomplete
-  var orgDataUrl = "{/literal}{$dataUrl}{literal}";
-  var hintText = "{/literal}{ts escape='js'}Type in a partial or complete name of an existing contact.{/ts}{literal}";
-  cj('#member_of_contact').autocomplete( orgDataUrl,
-    { width : 200, selectFirst : false, hintText: hintText, matchContains: true, minChars: 1, max: {/literal}{crmSetting name="search_autocomplete_count" group="Search Preferences"}{literal}
-  }).result(
-    function(event, data, formatted) {
-      ( parseInt( data[1] ) ) ? cj( "#member_of_contact_id" ).val( data[1] ) : cj( "#member_of_contact_id" ).val('');
-    }).bind('click', function( ) {
-      cj('#member_of_contact_id').val('');
-    });
-
-  {/literal}
-  {if $member_org}
-    {literal} cj('#member_of_contact').val( "{/literal}{$member_org}{literal}");{/literal}
-  {/if}
-
-  {* setdefault in edit mode *}
-  {if $action eq 2}
-    var memberOrgId = "{$member_org_id}";
-    {literal}
-    var dataUrl = "{/literal}{crmURL p='civicrm/ajax/rest' h=0
-    q="className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=contact&org=1&id=" }{literal}" + memberOrgId;
-
-    cj.ajax({
-      url     : dataUrl,
-      success : function(html){
-        htmlText = html.split( '|' , 2);
-        cj('input#member_of_contact').val(htmlText[0]);
-      }
-    });
-  {/literal}{/if}{literal}
-  // end of member org autocomplete
-
   showHidePeriodSettings();
   cj('#duration_unit').change(function(){
     showHidePeriodSettings();
-- 
2.25.1