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

work on converting editing to be ISF compatible

Browse source
This commit is contained in:
brianjlowe 2013-08-07 13:48:37 -04:00
parent 887cc94e8d
commit cbdbe629d1
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
View file

@ -171,6 +171,9 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
makeEditConfigurationVTwo( editConfGeneratorName, vreq, session); makeEditConfigurationVTwo( editConfGeneratorName, vreq, session);
} }
if(editConfig == null) {
log.error("editConfig is null! How did this happen?");
}
String editKey = EditConfigurationUtils.getEditKey(vreq); String editKey = EditConfigurationUtils.getEditKey(vreq);
editConfig.setEditKey(editKey); editConfig.setEditKey(editKey);

1
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -458,6 +458,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
subjectUri, subjectUri,
predicateUri, predicateUri,
objectKey, objectKey,
null,
statementDisplay, statementDisplay,
null, vreq); null, vreq);
ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper(); ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper();

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
View file

@ -218,7 +218,7 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
} }
listForThisSubclass.add(new ObjectPropertyStatementTemplateModel(subjectUri, listForThisSubclass.add(new ObjectPropertyStatementTemplateModel(subjectUri,
propertyUri, objectKey, map, getTemplateName(), vreq)); propertyUri, rangeUri, objectKey, map, getTemplateName(), vreq));
} }

10
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
View file

@ -31,7 +31,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
private final String editUrl; private final String editUrl;
private final String deleteUrl; private final String deleteUrl;
public ObjectPropertyStatementTemplateModel(String subjectUri, String propertyUri, String objectKey, public ObjectPropertyStatementTemplateModel(String subjectUri, String propertyUri, String rangeUri, String objectKey,
Map<String, String> data, String templateName, VitroRequest vreq) { Map<String, String> data, String templateName, VitroRequest vreq) {
super(subjectUri, propertyUri, 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 // Do delete url first, since it is used in building edit url
this.deleteUrl = makeDeleteUrl(); this.deleteUrl = makeDeleteUrl();
this.editUrl = makeEditUrl(ops); this.editUrl = makeEditUrl(ops, rangeUri);
} }
private String makeDeleteUrl() { private String makeDeleteUrl() {
@ -90,7 +90,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
return UrlBuilder.getUrl(EDIT_PATH, params); 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? // Is the edit link suppressed for this property?
if (new EditLinkSuppressor(vreq).isEditLinkSuppressed(propertyUri)) { if (new EditLinkSuppressor(vreq).isEditLinkSuppressed(propertyUri)) {
return ""; return "";
@ -115,6 +115,10 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
params.put("deleteProhibited", "prohibited"); params.put("deleteProhibited", "prohibited");
} }
if (rangeUri != null) {
params.put("rangeUri", rangeUri);
}
params.putAll(UrlBuilder.getModelParams(vreq)); params.putAll(UrlBuilder.getModelParams(vreq));
return UrlBuilder.getUrl(EDIT_PATH, params); return UrlBuilder.getUrl(EDIT_PATH, params);

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java
View file

@ -41,7 +41,7 @@ public class UncollatedObjectPropertyTemplateModel extends ObjectPropertyTemplat
String objectKey = getObjectKey(); String objectKey = getObjectKey();
for (Map<String, String> map : statementData) { for (Map<String, String> map : statementData) {
statements.add(new ObjectPropertyStatementTemplateModel(subjectUri, statements.add(new ObjectPropertyStatementTemplateModel(subjectUri,
propertyUri, objectKey, map, getTemplateName(), vreq)); propertyUri, rangeUri, objectKey, map, getTemplateName(), vreq));
} }
postprocessStatementList(statements); postprocessStatementList(statements);