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

VIVO-500 property deletion updates for faux props

Browse source
This commit is contained in:
brianjlowe 2013-11-06 17:29:19 -05:00
parent bc0cf6be63
commit 5b6e86ab01
6 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
View file

@ -62,7 +62,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,subjectURI)); baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,subjectURI));
try { try {
ontModel.remove(subjRes,pred,objRes); ontModel.remove(subjRes,pred,objRes);
updatePropertyDateTimeValue(subjRes,MODTIME,Calendar.getInstance().getTime(),ontModel);
} finally { } finally {
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI)); baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI));
} }
@ -78,7 +77,6 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,objectURI)); baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,objectURI));
try { try {
ontModel.remove(objRes,invPred,subjRes); ontModel.remove(objRes,invPred,subjRes);
updatePropertyDateTimeValue(objRes,MODTIME,Calendar.getInstance().getTime(),ontModel);
} finally { } finally {
baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI)); 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())); getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,prop.getSubjectEntURI()));
try { try {
ontModel.add(subjRes,pred,objRes); ontModel.add(subjRes,pred,objRes);
updatePropertyDateTimeValue(subjRes,MODTIME,Calendar.getInstance().getTime(),getOntModel());
} finally { } finally {
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),false,prop.getSubjectEntURI())); 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())); getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,prop.getObjectEntURI()));
try { try {
ontModel.add(objRes,invPred,subjRes); ontModel.add(objRes,invPred,subjRes);
updatePropertyDateTimeValue(objRes,MODTIME,Calendar.getInstance().getTime(),getOntModel());
} finally { } finally {
getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),false,prop.getSubjectEntURI())); getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),false,prop.getSubjectEntURI()));
} }

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

@ -367,6 +367,14 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
return editConfig.getObject(); return editConfig.getObject();
} }
public String getDomainUri() {
return EditConfigurationUtils.getDomainUri(vreq);
}
public String getRangeUri() {
return EditConfigurationUtils.getRangeUri(vreq);
}
//data literal //data literal
//Thus would depend on the literals on the form //Thus would depend on the literals on the form

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

@ -47,11 +47,11 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
ops.setProperty(predicate); ops.setProperty(predicate);
// 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(ops);
this.editUrl = makeEditUrl(ops); this.editUrl = makeEditUrl(ops);
} }
private String makeDeleteUrl() { private String makeDeleteUrl(ObjectPropertyStatement ops) {
// Is the delete link suppressed for this property? // Is the delete link suppressed for this property?
if (property.isDeleteLinkSuppressed()) { if (property.isDeleteLinkSuppressed()) {
return ""; 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.put("templateName", templateName);
params.putAll(UrlBuilder.getModelParams(vreq)); params.putAll(UrlBuilder.getModelParams(vreq));

2
webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
View file

@ -30,6 +30,8 @@
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}" role="input" /> <input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}" role="input" />
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" /> <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri}" role="input" />
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri}" role="input" />
<#if editConfiguration.dataProperty = true> <#if editConfiguration.dataProperty = true>
<input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" /> <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" />

2
webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
View file

@ -7,6 +7,8 @@
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/> <input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/>
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/> <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri}"/>
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri}"/>
<input type="hidden" name="cmd" value="delete"/> <input type="hidden" name="cmd" value="delete"/>
<input type="hidden" name="editKey" value="${editConfiguration.editKey}"/> <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
<#if editConfiguration.dataProperty = true> <#if editConfiguration.dataProperty = true>