jenkins-bot has submitted this change and it was merged.
Change subject: Fix url for batch merge link
......................................................................
Fix url for batch merge link
This is a fix that is upstream but must have regressed when we last merged with
upstream due
to whitespace discrepancies. Next release we should be able to just have the
upstream version
Change-Id: Ic00851a1c99b5151997a85a27e259e3d866803cc
---
M templates/CRM/Contact/Page/DedupeFind.tpl
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl
b/templates/CRM/Contact/Page/DedupeFind.tpl
index cefab17..2811f79 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -156,8 +156,8 @@
{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge"
q="`$urlQuery`&action=map" a=1}{/capture}
<a href="{$backURL}" title="{ts}Batch Merge Duplicate Contacts{/ts}"
onclick="return confirm('{ts escape="js"}This will run the batch merge process
on the selected duplicates. The operation will run in safe mode - only records
with no direct data conflicts will be merged. Click OK to proceed if you are
sure you wish to run this operation.{/ts}');" class="button"><span><i
class="crm-i fa-compress"></i> {ts}Batch Merge Selected
Duplicates{/ts}</span></a>
- {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind"
q="`$urlQuery`&action=renew" a=1}{/capture}
- <a href="{$backURL}" title="{ts}Batch Merge Duplicate Contacts{/ts}"
onclick="return confirm('{ts escape="js"}This will run the batch merge process
on the listed duplicates. The operation will run in safe mode - only records
with no direct data conflicts will be merged. Click OK to proceed if you are
sure you wish to run this operation.{/ts}');" class="button"><span><i
class="crm-i fa-compress"></i> {ts}Batch Merge All Duplicates{/ts}</span></a>
+ {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge"
q=$urlQuery a=1}{/capture}
+ <a href="{$backURL}" title="{ts}Batch Merge Duplicate Contacts{/ts}"
onclick="return confirm('{ts escape="js"}This will run the batch merge process
on the listed duplicates. The operation will run in safe mode - only records
with no direct data conflicts will be merged. Click OK to proceed if you are
sure you wish to run this operation.{/ts}');" class="button"><span><i
class="crm-i fa-compress"></i> {ts}Batch Merge All Duplicates{/ts}</span></a>
<a href='#' title="{ts}Flip Selected Duplicates{/ts}"
class="crm-dedupe-flip-selections button"><span><i class="crm-i
fa-exchange"></i> {ts}Flip Selected Duplicates{/ts}</span></a>
--
To view, visit https://gerrit.wikimedia.org/r/311645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic00851a1c99b5151997a85a27e259e3d866803cc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
