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
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);
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) {

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