From 63f15a90ef14a04f271077aa6cb7ff82e75bc38d Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 1 Mar 2021 21:56:42 +0100
Subject: [PATCH] Fixed delete individual url params

---
 .../generators/DefaultDeleteGenerator.java    | 12 +++++++++--
 .../BaseIndividualTemplateModel.java          |  5 ++---
 .../forms/confirmDeleteIndividualForm.ftl     | 21 +++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
index 11ef2d455..c329543fe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
@@ -49,18 +49,26 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
     	prepare(vreq, editConfiguration);
     	if (editConfiguration.getPredicateUri() == null && editConfiguration.getSubjectUri() == null) {
     		editConfiguration.setTemplate(individualTemplate);
-    		addRedirectUrl(vreq, editConfiguration);
+    		addDeleteParams(vreq, editConfiguration);
     	}else {
     		editConfiguration.setTemplate(propertyTemplate);
     	}
     	return editConfiguration;
     }
 
-	private void addRedirectUrl(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
+	private void addDeleteParams(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
 		String redirectUrl = vreq.getParameter("redirectUrl");
 		if (redirectUrl != null) {
 			editConfiguration.addFormSpecificData("redirectUrl", redirectUrl);
 		}
+		String individualName = vreq.getParameter("individualName");
+		if (redirectUrl != null) {
+			editConfiguration.addFormSpecificData("individualName", individualName);
+		}
+		String individualType = vreq.getParameter("individualType");
+		if (redirectUrl != null) {
+			editConfiguration.addFormSpecificData("individualType", individualType);
+		}
 	}
 
 	private EditConfigurationVTwo  setupEditConfiguration(VitroRequest vreq, HttpSession session) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
index a4d3509a6..efaa8396f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
@@ -157,13 +157,12 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
     	ParamMap params = new ParamMap(
           "objectUri", individual.getURI(),
           "cmd", "delete",
-          "statement_label",getNameStatement().getValue(),
-          "statement_object",individual.getURI()
+          "individualName",getNameStatement().getValue()
           );
     	Iterator<String> typesIterator = types.iterator();
     	if (types.iterator().hasNext()) {
 				String type = typesIterator.next();
-				params.put("statement_type", type);
+				params.put("individualType", type);
 			}
 
 			return UrlBuilder.getUrl(EDIT_PATH, params);
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
index 01d28ec62..22bb8bea1 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
@@ -4,19 +4,28 @@
 <#else>
 	<#assign redirectUrl = "/" />
 </#if>
-<#assign statement = editConfiguration.objectStatementDisplay />
-<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
+<#if editConfiguration.pageData.individualName??>
+	<#assign individualName = editConfiguration.pageData.individualName />
+</#if>
+<#if editConfiguration.pageData.individualType??>
+	<#assign individualType = editConfiguration.pageData.individualType />
+</#if>
 
 <form action="${editConfiguration.deleteIndividualProcessingUrl}" method="get">
     <h2>${i18n().confirm_individual_deletion} </h2>
 
     <input type="hidden" name="individualUri"    value="${editConfiguration.objectUri}" role="input" />
     <input type="hidden" name="redirectUrl"    value="${redirectUrl}" role="input" />
-   <#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 
-     <#if statement?has_content>
-       <#include deletionTemplateName />
-    </#if>
+    <p>
+      <#if individualType??>
+       ${individualType}
+      </#if>
+      <#if individualName??>
+       ${individualName} 
+      </#if>
+    </p>
+
    <br />
     <p class="submit">
         <input type="submit" id="submit" value="${i18n().delete_button}" role="button"/>