From d799c6212010f235f1aabcba74677e6edba63b3a Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Wed, 20 Mar 2013 17:35:58 +0530 Subject: [PATCH] minor fix for CRM-12153 : Tag Merge UI break --- templates/CRM/Admin/Page/Tag.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl index d22334a894..0316a67090 100644 --- a/templates/CRM/Admin/Page/Tag.tpl +++ b/templates/CRM/Admin/Page/Tag.tpl @@ -111,8 +111,8 @@ cj("#mergeTagDialog").hide( ); cj( function() { cj('.merge_tag').click(function(){ var row_id = cj(this).closest('tr').attr('id'); - var tagId = row_id.split('_'); - mergeTag( tagId[2] ); + var tagId = row_id.split('-'); + mergeTag(tagId[1]); }); }); @@ -168,7 +168,7 @@ function mergeTag( fromId ) { /* send synchronous request so that disabling any actions for slow servers*/ var postUrl = {/literal}"{crmURL p='civicrm/ajax/mergeTags' h=0 }"{literal}; - var data = '{fromId:'+ fromId + ',toId:'+ toId + ",key:{/literal}{crmKey name='civicrm/ajax/mergeTags'}{literal}}"; + var data = {fromId: fromId, toId: toId, key:{/literal}"{crmKey name='civicrm/ajax/mergeTags'}"{literal}}; cj.ajax({ type : "POST", url : postUrl, data : data, -- 2.25.1