From 9dd2654a724c13829adc8a2a3846ca22f3239429 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 28 Sep 2023 12:04:26 +1300
Subject: [PATCH] Fix delete from view participant

---
 templates/CRM/Event/Form/ParticipantView.tpl | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/templates/CRM/Event/Form/ParticipantView.tpl b/templates/CRM/Event/Form/ParticipantView.tpl
index d5bc24675f..5e49190299 100644
--- a/templates/CRM/Event/Form/ParticipantView.tpl
+++ b/templates/CRM/Event/Form/ParticipantView.tpl
@@ -16,16 +16,12 @@
          {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey}
          {assign var='editUrlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"}
          {/if}
-               <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$editUrlParams}" accesskey="e"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit{/ts}</span></a>
-            {/if}
-            {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')}
-                {assign var='deleteUrlParams' value="reset=1&id=$id&cid=$contact_id&context=$context&selectedChild=event"}
-          {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey}
-          {assign var='deleteUrlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event&key=$searchKey"}
+             <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$editUrlParams}" accesskey="e"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit{/ts}</span></a>
           {/if}
-                <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$deleteUrlParams}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
-            {/if}
-            {include file="CRM/common/formButtons.tpl" location="top"}
+          {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')}
+            <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$id"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
+          {/if}
+
         </div>
     </div>
     <table class="crm-info-panel">
@@ -132,7 +128,7 @@
         <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$editUrlParams}" accesskey="e"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit{/ts}</span></a>
       {/if}
       {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')}
-        <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$deleteUrlParams}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
+        <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$id"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
       {/if}
       {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
-- 
2.25.1