diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
index 424986cd6..4f1bbd1c4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
@@ -174,7 +174,7 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
//process object property
private void processObjectProperty(VitroRequest vreq) {
ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
-
+
//if this property is true, it means the object needs to be deleted along with statement
if(prop.getStubObjectRelation())
{
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
index e68caf10f..e03ed48c5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
@@ -62,7 +62,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,subjectURI));
try {
ontModel.remove(subjRes,pred,objRes);
- updatePropertyDateTimeValue(subjRes,MODTIME,Calendar.getInstance().getTime(),ontModel);
} finally {
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI));
}
@@ -78,7 +77,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,objectURI));
try {
ontModel.remove(objRes,invPred,subjRes);
- updatePropertyDateTimeValue(objRes,MODTIME,Calendar.getInstance().getTime(),ontModel);
} finally {
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI));
}
@@ -215,7 +213,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,prop.getSubjectEntURI()));
try {
ontModel.add(subjRes,pred,objRes);
- updatePropertyDateTimeValue(subjRes,MODTIME,Calendar.getInstance().getTime(),getOntModel());
} finally {
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),false,prop.getSubjectEntURI()));
}
@@ -224,7 +221,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,prop.getObjectEntURI()));
try {
ontModel.add(objRes,invPred,subjRes);
- updatePropertyDateTimeValue(objRes,MODTIME,Calendar.getInstance().getTime(),getOntModel());
} finally {
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),false,prop.getSubjectEntURI()));
}
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 49b17fbe4..cac4c484e 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
@@ -367,6 +367,14 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
return editConfig.getObject();
}
+ public String getDomainUri() {
+ return EditConfigurationUtils.getDomainUri(vreq);
+ }
+
+ public String getRangeUri() {
+ return EditConfigurationUtils.getRangeUri(vreq);
+ }
+
//data literal
//Thus would depend on the literals on the form
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 c9da36ce8..8ba4577b0 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
@@ -47,11 +47,11 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
ops.setProperty(predicate);
// Do delete url first, since it is used in building edit url
- this.deleteUrl = makeDeleteUrl();
+ this.deleteUrl = makeDeleteUrl(ops);
this.editUrl = makeEditUrl(ops);
}
- private String makeDeleteUrl() {
+ private String makeDeleteUrl(ObjectPropertyStatement ops) {
// Is the delete link suppressed for this property?
if (property.isDeleteLinkSuppressed()) {
return "";
@@ -87,6 +87,13 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
}
}
+ if (ops.getProperty()!= null && ops.getProperty().getDomainVClassURI() != null) {
+ params.put("domainUri", ops.getProperty().getDomainVClassURI());
+ }
+ if (ops.getProperty()!= null && ops.getProperty().getRangeVClassURI() != null) {
+ params.put("rangeUri", ops.getProperty().getRangeVClassURI());
+ }
+
params.put("templateName", templateName);
params.putAll(UrlBuilder.getModelParams(vreq));
diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index dbb6ef811..7e2f13cac 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -30,6 +30,8 @@
+
+
<#if editConfiguration.dataProperty = true>
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index 0ad052d88..489e07a8e 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -7,6 +7,8 @@
+
+
<#if editConfiguration.dataProperty = true>