Merge pull request #5786 from mallezie/crm-16283-duplicaterelationcheck

[civicrm-core.git] / templates / CRM / Contact / Form / Relationship.tpl

diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index 4524998ce0ba0f544d0ef9afdc97f7badb32b604..a5fe163a18d2e5379e0b27eda97ec0cbecd4314d 100644 (file)
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -139,8 +139,8 @@
     </div>
   {/if}
   {if ($action EQ 1) OR ($action EQ 2) }
-    {*include custom data js file - setting includeWysiwygEditor=TRUE because it's already been loaded*}
-    {include file="CRM/common/customData.tpl" includeWysiwygEditor=TRUE}
+    {*include custom data js file *}
+    {include file="CRM/common/customData.tpl"}
     <script type="text/javascript">
       {literal}
       CRM.$(function($) {
@@ -174,12 +174,11 @@
               if (contact_sub_type) {
                 api.params.contact_sub_type = contact_sub_type;
               }
-              // Todo: pass sub-type to new contact profile otherwise relationship create will fail. Disabling it completely for now.
-              $contactField.data('create-links', !contact_sub_type);
               $contactField
                 .val('')
                 .prop('disabled', false)
                 .data('api-params', api)
+                .data('user-filter', {})
                 .attr('placeholder', relationshipData[rType]['placeholder_' + target])
                 .change();
             }