From cbdbe629d1aa0e9b1d37949063a9b7fe885b2e16 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Wed, 7 Aug 2013 13:48:37 -0400 Subject: [PATCH] work on converting editing to be ISF compatible --- .../controller/EditRequestDispatchController.java | 3 +++ .../edit/EditConfigurationTemplateModel.java | 1 + .../CollatedObjectPropertyTemplateModel.java | 2 +- .../ObjectPropertyStatementTemplateModel.java | 10 +++++++--- .../UncollatedObjectPropertyTemplateModel.java | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index b31bbf10c..1ba55f5ed 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -171,6 +171,9 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet { makeEditConfigurationVTwo( editConfGeneratorName, vreq, session); } + if(editConfig == null) { + log.error("editConfig is null! How did this happen?"); + } String editKey = EditConfigurationUtils.getEditKey(vreq); editConfig.setEditKey(editKey); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index f4306cb17..7203cbbb9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -458,6 +458,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel { subjectUri, predicateUri, objectKey, + null, statementDisplay, null, vreq); ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java index fd634595e..780fb050d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java @@ -218,7 +218,7 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM } listForThisSubclass.add(new ObjectPropertyStatementTemplateModel(subjectUri, - propertyUri, objectKey, map, getTemplateName(), vreq)); + propertyUri, rangeUri, objectKey, map, getTemplateName(), vreq)); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java index f68441b96..9c94b25b4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java @@ -31,7 +31,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl private final String editUrl; private final String deleteUrl; - public ObjectPropertyStatementTemplateModel(String subjectUri, String propertyUri, String objectKey, + public ObjectPropertyStatementTemplateModel(String subjectUri, String propertyUri, String rangeUri, String objectKey, Map data, String templateName, VitroRequest vreq) { super(subjectUri, propertyUri, vreq); @@ -45,7 +45,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl // Do delete url first, since it is used in building edit url this.deleteUrl = makeDeleteUrl(); - this.editUrl = makeEditUrl(ops); + this.editUrl = makeEditUrl(ops, rangeUri); } private String makeDeleteUrl() { @@ -90,7 +90,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl return UrlBuilder.getUrl(EDIT_PATH, params); } - private String makeEditUrl(ObjectPropertyStatement ops) { + private String makeEditUrl(ObjectPropertyStatement ops, String rangeUri) { // Is the edit link suppressed for this property? if (new EditLinkSuppressor(vreq).isEditLinkSuppressed(propertyUri)) { return ""; @@ -115,6 +115,10 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl params.put("deleteProhibited", "prohibited"); } + if (rangeUri != null) { + params.put("rangeUri", rangeUri); + } + params.putAll(UrlBuilder.getModelParams(vreq)); return UrlBuilder.getUrl(EDIT_PATH, params); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java index 15f53b4c4..c6be5211f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java @@ -41,7 +41,7 @@ public class UncollatedObjectPropertyTemplateModel extends ObjectPropertyTemplat String objectKey = getObjectKey(); for (Map map : statementData) { statements.add(new ObjectPropertyStatementTemplateModel(subjectUri, - propertyUri, objectKey, map, getTemplateName(), vreq)); + propertyUri, rangeUri, objectKey, map, getTemplateName(), vreq)); } postprocessStatementList(statements);