litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed delete individual url params

Browse source
This commit is contained in:
Georgy Litvinov 2021-03-01 21:56:42 +01:00
parent cb35b5f647
commit 63f15a90ef
3 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
View file

@ -49,18 +49,26 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
prepare(vreq, editConfiguration); prepare(vreq, editConfiguration);
if (editConfiguration.getPredicateUri() == null && editConfiguration.getSubjectUri() == null) { if (editConfiguration.getPredicateUri() == null && editConfiguration.getSubjectUri() == null) {
editConfiguration.setTemplate(individualTemplate); editConfiguration.setTemplate(individualTemplate);
addRedirectUrl(vreq, editConfiguration); addDeleteParams(vreq, editConfiguration);
}else { }else {
editConfiguration.setTemplate(propertyTemplate); editConfiguration.setTemplate(propertyTemplate);
} }
return editConfiguration; return editConfiguration;
} }
private void addRedirectUrl(VitroRequest vreq, EditConfigurationVTwo editConfiguration) { private void addDeleteParams(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
String redirectUrl = vreq.getParameter("redirectUrl"); String redirectUrl = vreq.getParameter("redirectUrl");
if (redirectUrl != null) { if (redirectUrl != null) {
editConfiguration.addFormSpecificData("redirectUrl", redirectUrl); 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) { private EditConfigurationVTwo setupEditConfiguration(VitroRequest vreq, HttpSession session) {

5
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
View file

@ -157,13 +157,12 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
ParamMap params = new ParamMap( ParamMap params = new ParamMap(
"objectUri", individual.getURI(), "objectUri", individual.getURI(),
"cmd", "delete", "cmd", "delete",
"statement_label",getNameStatement().getValue(), "individualName",getNameStatement().getValue()
"statement_object",individual.getURI()
); );
Iterator<String> typesIterator = types.iterator(); Iterator<String> typesIterator = types.iterator();
if (types.iterator().hasNext()) { if (types.iterator().hasNext()) {
String type = typesIterator.next(); String type = typesIterator.next();
params.put("statement_type", type); params.put("individualType", type);
} }
return UrlBuilder.getUrl(EDIT_PATH, params); return UrlBuilder.getUrl(EDIT_PATH, params);

19
webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
View file

@ -4,19 +4,28 @@
<#else> <#else>
<#assign redirectUrl = "/" /> <#assign redirectUrl = "/" />
</#if> </#if>
<#assign statement = editConfiguration.objectStatementDisplay /> <#if editConfiguration.pageData.individualName??>
<#assign deletionTemplateName = editConfiguration.deleteTemplate/> <#assign individualName = editConfiguration.pageData.individualName />
</#if>
<#if editConfiguration.pageData.individualType??>
<#assign individualType = editConfiguration.pageData.individualType />
</#if>
<form action="${editConfiguration.deleteIndividualProcessingUrl}" method="get"> <form action="${editConfiguration.deleteIndividualProcessingUrl}" method="get">
<h2>${i18n().confirm_individual_deletion} </h2> <h2>${i18n().confirm_individual_deletion} </h2>
<input type="hidden" name="individualUri" value="${editConfiguration.objectUri}" role="input" /> <input type="hidden" name="individualUri" value="${editConfiguration.objectUri}" role="input" />
<input type="hidden" name="redirectUrl" value="${redirectUrl}" role="input" /> <input type="hidden" name="redirectUrl" value="${redirectUrl}" role="input" />
<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
<#if statement?has_content> <p>
<#include deletionTemplateName /> <#if individualType??>
${individualType}
</#if> </#if>
<#if individualName??>
${individualName}
</#if>
</p>
<br /> <br />
<p class="submit"> <p class="submit">
<input type="submit" id="submit" value="${i18n().delete_button}" role="button"/> <input type="submit" id="submit" value="${i18n().delete_button}" role="button"/>