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 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); } }, diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index c8d1ee17..f92b8f4e 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -432,7 +432,8 @@ local:mailingAddressContext a :ConfigContext ; :hasConfiguration local:mailingAddressConfig ; :configContextFor ; :qualifiedByDomain ; - :qualifiedBy . + :qualifiedBy ; + :qualifiedByRoot . local:mailingAddressConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ; @@ -447,6 +448,7 @@ local:mailingAddressContext a :ConfigContext ; :hasConfiguration local:mailingAddressConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:mailingAddressConfig a :ObjectPropertyDisplayConfig ; @@ -462,6 +464,7 @@ local:personTelephoneContext a :ConfigContext ; :hasConfiguration local:personTelephoneConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:personTelephoneConfig a :ObjectPropertyDisplayConfig ; @@ -477,6 +480,7 @@ local:orgTelephoneContext a :ConfigContext ; :hasConfiguration local:orgTelephoneConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:orgTelephoneConfig a :ObjectPropertyDisplayConfig ; @@ -492,6 +496,7 @@ local:personFaxContext a :ConfigContext ; :hasConfiguration local:personFaxConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:personFaxConfig a :ObjectPropertyDisplayConfig ; @@ -507,6 +512,7 @@ local:orgFaxContext a :ConfigContext ; :hasConfiguration local:orgFaxConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:orgFaxConfig a :ObjectPropertyDisplayConfig ; @@ -522,6 +528,7 @@ local:additionalEmailContext a :ConfigContext ; :hasConfiguration local:additionalEmailConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:additionalEmailConfig a :ObjectPropertyDisplayConfig ; @@ -537,6 +544,7 @@ local:primaryEmailContext a :ConfigContext ; :hasConfiguration local:primaryEmailConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:primaryEmailConfig a :ObjectPropertyDisplayConfig ; @@ -552,6 +560,7 @@ local:webpageContext a :ConfigContext ; :hasConfiguration local:webpageConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:webpageConfig a :ObjectPropertyDisplayConfig ; @@ -567,6 +576,7 @@ local:webpageContext a :ConfigContext ; :hasConfiguration local:webpageConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:webpageConfig a :ObjectPropertyDisplayConfig ; @@ -582,6 +592,7 @@ local:fullNameContext a :ConfigContext ; :hasConfiguration local:fullNameConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:fullNameConfig a :ObjectPropertyDisplayConfig ; @@ -597,6 +608,7 @@ local:preferredTitleContext a :ConfigContext ; :hasConfiguration local:preferredTitleConfig ; :configContextFor ; :qualifiedByDomain ; + :qualifiedByRoot ; :qualifiedBy . local:preferredTitleConfig a :ObjectPropertyDisplayConfig ;