From cabd58dd0a3bc8a4d29417fe7f26ca6e04ea7ac6 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 10:57:42 -0500 Subject: [PATCH 1/3] updates for issues VIVO-507 and VIVO-589 --- rdf/display/everytime/PropertyConfig.n3 | 2 +- src/org/vivoweb/webapp/util/ModelUtils.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index d017dc24..6322ed57 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1467,7 +1467,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "receipts" ; vitro:displayRankAnnot 3; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; :propertyGroup . diff --git a/src/org/vivoweb/webapp/util/ModelUtils.java b/src/org/vivoweb/webapp/util/ModelUtils.java index 629d9f52..b59dc4ca 100644 --- a/src/org/vivoweb/webapp/util/ModelUtils.java +++ b/src/org/vivoweb/webapp/util/ModelUtils.java @@ -103,6 +103,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyURI); properties.add(nonProcessPropertyURI); + properties.add(grantPropertyURI); return properties; } @@ -110,6 +111,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyInverseURI); properties.add(nonProcessPropertyInverseURI); + properties.add(grantPropertyInverseURI); return properties; } } From 803859cec7e413eb095c0ed772abec3fb3a17b0e Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 11:18:03 -0500 Subject: [PATCH 2/3] VIVO-593: fixed java script issue --- .../freemarker/edit/forms/js/adviseeRelationshipUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js index acf69156..88cba06f 100644 --- a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js @@ -83,7 +83,7 @@ var adviseeRelUtils = { // we don't want the user to see the label getting built, so hide the acSelector // field and display a bogus field that just has the last name in it. this.fauxLabel.val(lastName); - this.advisee.hide(); + this.advisor.hide(); this.fauxLabel.show(); this.advisor.val(name); this.lastName.val(lastName); From fe6f099a2ab9b8193815a1322a59e294b7ec2bc5 Mon Sep 17 00:00:00 2001 From: hudajkhan Date: Mon, 2 Dec 2013 13:09:52 -0500 Subject: [PATCH 3/3] VIVO 590 updating manageWebpagesGenerator to include range uri for cancel link --- .../edit/forms/manageWebpagesForIndividual.ftl | 3 +-- .../generators/ManageWebpagesForIndividualGenerator.java | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl index 81f38396..c4f0b1d0 100644 --- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl @@ -11,7 +11,6 @@ <#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined"> <#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined"> <#assign predicateUri=editConfiguration.predicateUri!"undefined"> -<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!""> <#if (editConfiguration.pageData.subjectName??) >

${editConfiguration.pageData.subjectName}

@@ -57,7 +56,7 @@ <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel. These can just be ordinary links, rather than a v:input element, as in addAuthorsToInformationResource.jsp. --> - ${i18n().add_new_web_page} + ${i18n().add_new_web_page} ${i18n().return_to_profile} diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java index 90effba9..8911b395 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java @@ -61,11 +61,20 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG config.addFormSpecificData("baseEditWebpageUrl", path); + //Also add domainUri and rangeUri if they exist, adding here instead of template + String domainUri = (String) vreq.getParameter("domainUri"); + String rangeUri = (String) vreq.getParameter("rangeUri"); paramMap = new ParamMap(); paramMap.put("subjectUri", config.getSubjectUri()); paramMap.put("predicateUri", config.getPredicateUri()); paramMap.put("editForm" , this.getEditForm() ); paramMap.put("cancelTo", "manage"); + if(domainUri != null && !domainUri.isEmpty()) { + paramMap.put("domainUri", domainUri); + } + if(rangeUri != null && !rangeUri.isEmpty()) { + paramMap.put("rangeUri", rangeUri); + } path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap); config.addFormSpecificData("showAddFormUrl", path);