From 14e83ecc6c78c27bf66fe09eb4f5d16e84a7ccad Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 6 Nov 2013 16:13:46 -0500 Subject: [PATCH 1/2] VIVO-491 cleaning up some minor address stuff --- .../edit/forms/js/mailingAddressUtils.js | 9 +++++++++ rdf/display/everytime/PropertyConfig.n3 | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js index d2104330..43648028 100644 --- a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js @@ -10,6 +10,8 @@ var mailingAddressUtils = { if ( editMode != "add" ) { this.setStreetAddressDisplayFields(); } + + this.setAddressFieldsIfErrors(); }, initObjectReferences: function() { @@ -18,9 +20,16 @@ var mailingAddressUtils = { this.street1 = $('#streetAddressOne'); this.street2 = $('#streetAddressTwo'); this.streetAddress = $('#streetAddress'); + this.errorSection = $('section#error-alert'); }, + setAddressFieldsIfErrors: function() { + if ( this.errorSection.length ) { + mailingAddressUtils.setStreetAddressDisplayFields(); + } + }, + bindEventListeners: function() { this.idCache = {}; diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 5aff1c63..aebf49ab 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -893,6 +893,20 @@ local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . +local:addressLocationContext a :ConfigContext ; + :hasConfiguration local:addressLocationConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedBy vivo:GeographicLocation . + +local:addressLocationConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "has geographic location" ; + vitro:displayRankAnnot 2; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + ### roles using the BFO_0000055 property ### local:bfo_0000055Context a :ConfigContext ; From 390c05ab3f1d30f2d45496f99d465095e0436864 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 6 Nov 2013 16:51:09 -0500 Subject: [PATCH 2/2] inverse predicate method now working --- .../generators/AddGrantRoleToPersonGenerator.java | 4 +--- .../generators/AddRoleToPersonTwoStageGenerator.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java index 09b02453..61e44257 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java @@ -271,9 +271,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator urisInScope.put("roleType", Arrays.asList(new String[]{getRoleType(vreq)})); //Setting inverse role predicate - // with ISF changes this will always be the same - urisInScope.put("inverseRolePredicate", Arrays.asList(new String[]{"http://purl.obolibrary.org/obo/RO_0000052"})); - + urisInScope.put("inverseRolePredicate", getInversePredicate(vreq)); editConfiguration.setUrisInScope(urisInScope); //Uris in scope include subject, predicate, and object var //literals in scope empty initially, usually populated by code in prepare for update diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java index c05f6c85..ea76d04b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java @@ -270,8 +270,7 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura HashMap> urisInScope = new HashMap>(); //Setting inverse role predicate - //With ISF changes this will always be the same - urisInScope.put("inverseRolePredicate", Arrays.asList(new String[]{"http://purl.obolibrary.org/obo/RO_0000052"})); + urisInScope.put("inverseRolePredicate", getInversePredicate(vreq)); urisInScope.put("roleType", list( getRoleType() ) ); //Uris in scope include subject, predicate, and object var