[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix url for batch merge link

[jenkins-bot (Code Review)]

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`=map" a=1}{/capture}
 {ts}Batch Merge Selected 
Duplicates{/ts}
 
-   {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" 
q="`$urlQuery`=renew" a=1}{/capture}
-{ts}Batch Merge All Duplicates{/ts}
+{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q=$urlQuery a=1}{/capture}
+ {ts}Batch Merge All Duplicates{/ts}
 
 {ts}Flip Selected Duplicates{/ts}
 

-- 
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 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix url for batch merge link

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311645

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/45/311645/1

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`=map" a=1}{/capture}
 {ts}Batch Merge Selected 
Duplicates{/ts}
 
-   {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" 
q="`$urlQuery`=renew" a=1}{/capture}
-{ts}Batch Merge All Duplicates{/ts}
+{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q=$urlQuery a=1}{/capture}
+ {ts}Batch Merge All Duplicates{/ts}
 
 {ts}Flip Selected Duplicates{/ts}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/311645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic00851a1c99b5151997a85a27e259e3d866803cc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits