From f1d5011fb58d14019d22605f83acc99ecf26fd37 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 16 Aug 2014 20:37:19 +0100 Subject: [PATCH] Membership js fix to work in popup --- CRM/Member/Form/Membership.php | 2 +- templates/CRM/Member/Form/Membership.tpl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index ab978a8563..3180b299f8 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -121,7 +121,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this); $this->_contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $this); $this->_processors = array(); - CRM_Core_Resources::singleton()->addSetting(array('ids' => array('contact' => $this->_contactID))); + $this->assign('contactID', $this->_contactID); // check for edit permission if (!CRM_Core_Permission::checkActionPermission('CiviMember', $this->_action)) { diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index 77229a2dbb..fad591f3c1 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -705,8 +705,9 @@ if ((memType > 0) && (allMemberships[memType]['has_related'])) { if (setDefault) cj('#max_related').val(allMemberships[memType]['max_related']); cj('#maxRelated').show(); - if(CRM.ids.contact > 0) { - CRM.api('relationship', 'getcount', {'contact_id' : CRM.ids.contact, 'membership_type_id' : memType}, { + var cid = {/literal}{if $contactID}{$contactID}{else}null{/if}{literal}; + if (cid) { + CRM.api('relationship', 'getcount', {contact_id: cid, membership_type_id: memType}, { success: function(result) { var relatable = ' ' + result.result + ts(' contacts are '); if(result.result === 0) { -- 2.25.1