From 1edcd06c1c48d02321fcd559a9cebef7858b0359 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Thu, 31 Oct 2013 10:46:17 -0400 Subject: [PATCH 1/4] adding "base root" annotation for VCard properties --- rdf/display/everytime/PropertyConfig.n3 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 7f2b7bd0..992008f4 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -415,7 +415,8 @@ local:mailingAddressContext a :ConfigContext ; :hasConfiguration local:mailingAddressConfig ; :configContextFor ; :qualifiedByDomain ; - :qualifiedBy . + :qualifiedBy ; + :qualifiedByRoot . local:mailingAddressConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ; @@ -430,6 +431,7 @@ local:mailingAddressContext a :ConfigContext ; :hasConfiguration local:mailingAddressConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:mailingAddressConfig a :ObjectPropertyDisplayConfig ; @@ -445,6 +447,7 @@ local:personTelephoneContext a :ConfigContext ; :hasConfiguration local:personTelephoneConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:personTelephoneConfig a :ObjectPropertyDisplayConfig ; @@ -460,6 +463,7 @@ local:orgTelephoneContext a :ConfigContext ; :hasConfiguration local:orgTelephoneConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:orgTelephoneConfig a :ObjectPropertyDisplayConfig ; @@ -475,6 +479,7 @@ local:personFaxContext a :ConfigContext ; :hasConfiguration local:personFaxConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:personFaxConfig a :ObjectPropertyDisplayConfig ; @@ -490,6 +495,7 @@ local:orgFaxContext a :ConfigContext ; :hasConfiguration local:orgFaxConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:orgFaxConfig a :ObjectPropertyDisplayConfig ; @@ -505,6 +511,7 @@ local:additionalEmailContext a :ConfigContext ; :hasConfiguration local:additionalEmailConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:additionalEmailConfig a :ObjectPropertyDisplayConfig ; @@ -520,6 +527,7 @@ local:primaryEmailContext a :ConfigContext ; :hasConfiguration local:primaryEmailConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:primaryEmailConfig a :ObjectPropertyDisplayConfig ; @@ -535,6 +543,7 @@ local:webpageContext a :ConfigContext ; :hasConfiguration local:webpageConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:webpageConfig a :ObjectPropertyDisplayConfig ; @@ -550,6 +559,7 @@ local:webpageContext a :ConfigContext ; :hasConfiguration local:webpageConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:webpageConfig a :ObjectPropertyDisplayConfig ; @@ -565,6 +575,7 @@ local:fullNameContext a :ConfigContext ; :hasConfiguration local:fullNameConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:fullNameConfig a :ObjectPropertyDisplayConfig ; @@ -580,6 +591,7 @@ local:preferredTitleContext a :ConfigContext ; :hasConfiguration local:preferredTitleConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:preferredTitleConfig a :ObjectPropertyDisplayConfig ; From 77d117413528e5814bfad8bccfbb184014fb85aa Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Thu, 31 Oct 2013 10:46:44 -0400 Subject: [PATCH 2/4] resetting the order in startup_listeners to speed migration --- productMods/WEB-INF/resources/startup_listeners.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index b0cb3e8d..72b4075e 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -34,12 +34,11 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdatePermissionSetUris edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup -edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup - # Invokes process to perform updates to align with ontology changes if needed --> -# Needs to run before submodels are attached and Pellet is set up --> edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase +edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup + # Must run after JenaDataSourceSetup edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup From c04a7aac7626f7f3652bb749566def9c95992040 Mon Sep 17 00:00:00 2001 From: tworrall Date: Thu, 31 Oct 2013 11:36:37 -0400 Subject: [PATCH 3/4] VIVO-426 editor display --- productMods/config/listViewConfig-authorInAuthorship.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index 755ceff4..6cc2978d 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -199,6 +199,7 @@ ?infoResource core:relatedBy ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . ?editorObj rdfs:label ?editor } UNION { ?subject ?property ?authorship . From f614f6cee457c0f6ce73273f775fea9a1c1859db Mon Sep 17 00:00:00 2001 From: tworrall Date: Thu, 31 Oct 2013 14:42:33 -0400 Subject: [PATCH 4/4] VIVO-440 orcid id change --- .../templates/freemarker/edit/forms/addOrcidIdToPerson.ftl | 3 ++- .../freemarker/edit/forms/js/addOrcidIdToPersonUtils.js | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl b/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl index eca559a1..b52c52fd 100644 --- a/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl @@ -58,7 +58,8 @@

- + +

diff --git a/productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js b/productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js index 5a9cffad..b979c348 100644 --- a/productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js @@ -12,6 +12,7 @@ var addOrcidIdToPersonUtils = { this.form = $('#personHasOrcidId'); this.orcidId = $('#orcidId'); + this.orcidIdDisplay = $('#orcidIdDisplay'); }, @@ -25,10 +26,10 @@ var addOrcidIdToPersonUtils = { buildOrcidIdURL: function() { - var orcidBase = "http://www.orcid.org/"; + var orcidBase = "http://orcid.org/"; var orcidIdVal = ""; - if ( this.orcidId.val().length > 0 ) { - orcidIdVal = orcidBase + this.orcidId.val(); + if ( this.orcidIdDisplay.val().length > 0 ) { + orcidIdVal = orcidBase + this.orcidIdDisplay.val(); this.orcidId.val(orcidIdVal); } },