From 3bc86714dd752eff59bd076be3f00283bcf3053b Mon Sep 17 00:00:00 2001 From: gneissone Date: Wed, 26 Sep 2018 15:17:32 -0400 Subject: [PATCH 01/22] Fix list view and template for vCard authors --- .../config/listViewConfig-informationResourceInAuthorship.xml | 2 +- .../propStatement-informationResourceInAuthorship.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml index 58100245..9c1a98fb 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml @@ -64,7 +64,7 @@ bind ( COALESCE(?firstName, "") As ?firstName1) . bind ( COALESCE(?middleName, "") As ?middleName1) . bind ( COALESCE(?lastName, "") As ?lastName1) . - bind (concat(str(?lastName1 + ", "),str(?firstName1 + " "),str(?middleName1)) as ?authorName) . + bind (concat(str(?lastName1),", ",str(?firstName1)," ",str(?middleName1)) as ?authorName) . OPTIONAL { ?subject ?property ?authorship . diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index 170a72d0..0c34b8ad 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl @@ -19,7 +19,7 @@ <#if statement.authorName?replace(" ","")?length == statement.authorName?replace(" ","")?last_index_of(",") + 1 > ${statement.authorName?replace(",","")} <#else> - ${statement.authorName} + ${statement.authorName!i18n().missing_author} <#else> ${statement.authorName} From c85503300084e667cdf77c084da050c5862e7d69 Mon Sep 17 00:00:00 2001 From: Michael Conlon Date: Tue, 25 Sep 2018 15:34:02 -0400 Subject: [PATCH 02/22] Correct 10 broken prefixes --- .../rdf/tbox/firsttime/vitroAnnotations.n3 | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 index 63b9dc73..41d6f1bc 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 @@ -1,25 +1,25 @@ @prefix bibo: . @prefix cito: . @prefix c4o: . -@prefix dcterms: . -@prefix event: . +@prefix dcterms: . +@prefix event: . @prefix fabio: . @prefix foaf: . -@prefix geo: . +@prefix geo: . @prefix obo: . -@prefix ocrer: . -@prefix ocresd: . -@prefix ocresp: . -@prefix ocrest: . +@prefix ocrer: . +@prefix ocresd: . +@prefix ocresp: . +@prefix ocrest: . @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix ro: . -@prefix scires: . -@prefix skos: . +@prefix ro: . +@prefix scires: . +@prefix skos: . @prefix swo: . @prefix vann: . -@prefix vcard: . +@prefix vcard: . @prefix vitro: . @prefix vitro-public: . @prefix vivo: . From 31921e7de5d8e9e9e4304e97219184c7b108b3e7 Mon Sep 17 00:00:00 2001 From: Michael Conlon Date: Thu, 27 Sep 2018 09:46:47 -0400 Subject: [PATCH 03/22] Use URI for ontology references, not prefixes --- .../rdf/tbox/firsttime/vitroAnnotations.n3 | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 index 41d6f1bc..0c20ae08 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 @@ -25,83 +25,83 @@ @prefix vivo: . @prefix xsd: . -bibo: + rdfs:label "Bibliographic Ontology"@en-US ; vitro:ontologyPrefixAnnot "bibo" . -skos: + rdfs:label "SKOS (Simple Knowledge Organization System)"@en-US ; vitro:ontologyPrefixAnnot "skos" . -vivo: + rdfs:label "VIVO Core Ontology"@en-US ; vitro:ontologyPrefixAnnot "vivo" . -ocrer: + rdfs:label "OCRe Research"@en-US ; vitro:ontologyPrefixAnnot "ocrer" . -ocresd: + rdfs:label "OCRe Study Design"@en-US ; vitro:ontologyPrefixAnnot "ocresd" . -ocresp: + rdfs:label "OCRe Study Protocol"@en-US ; vitro:ontologyPrefixAnnot "ocresp" . -ocrest: + rdfs:label "OCRe Statistics"@en-US ; vitro:ontologyPrefixAnnot "ocresst" . -geo: + rdfs:label "Geopolitical Ontology"@en-US ; vitro:ontologyPrefixAnnot "geo" . -event: + rdfs:label "Event Ontology"@en-US ; vitro:ontologyPrefixAnnot "event" . -obo: + rdfs:label "OBO Foundry"@en-US ; vitro:ontologyPrefixAnnot "obo" . -vcard: + rdfs:label "VCard"@en-US ; vitro:ontologyPrefixAnnot "vcard" . -foaf: + rdfs:label "FOAF (Friend of a Friend)"@en-US ; vitro:ontologyPrefixAnnot "foaf" . -scires: + rdfs:label "VIVO Scientific Research Ontology"@en-US ; vitro:ontologyPrefixAnnot "scires" . -fabio: + rdfs:label "FaBiO (FRBR-Aligned Bibliographic Ontology)"@en-US ; vitro:ontologyPrefixAnnot "fabio" . -c4o: + rdfs:label "Citation Counting and Context Characterization Ontology"@en-US ; vitro:ontologyPrefixAnnot "c4o" . -cito: + rdfs:label "CiTO (Citation Typing Ontology)"@en-US ; vitro:ontologyPrefixAnnot "cito" . -dcterms: + rdfs:label "Dublin Core Terms"@en-US ; vitro:ontologyPrefixAnnot "dcterms" . -vann: + rdfs:label "Vocabulary for Annotating Vocabulary Descriptions"@en-US ; vitro:ontologyPrefixAnnot "vann" . -ro: + rdfs:label "Relations Ontology"@en-US ; vitro:ontologyPrefixAnnot "ro" . -swo: + rdfs:label "Software Ontology"@en-US ; vitro:ontologyPrefixAnnot "swo" . From 1ffdf3e11c67dd71c7cee61232a65bc4e7fd303c Mon Sep 17 00:00:00 2001 From: Mike Conlon Date: Wed, 10 Oct 2018 05:44:13 -0400 Subject: [PATCH 04/22] has collaborator is symmetric (#90) * has collaborator is reflexive * has collaborator is symmetric --- home/src/main/resources/rdf/tbox/filegraph/vivo.owl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl index 95a07eaa..cffee159 100644 --- a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl +++ b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl @@ -1911,12 +1911,16 @@ there is a measurement process p that has specified output m, a measurement datu - has collaborator - + + + has collaborator + Fran has collaborator Jim, they work together regularly. + + Two agents are collaborators if they work together to produce common results. + PERSON: Michael Conlon + Merriam Webster (https://www.merriam-webster.com/dictionary/collaborator) - - From 2f12d0830e01a2cae6cfe228f13cb75f332e307c Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Wed, 10 Oct 2018 12:57:30 +0100 Subject: [PATCH 05/22] Add i18n create/edit variables to service provider role template (#81) --- .../freemarker/edit/forms/addServiceProviderRoleToPerson.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl index bef54b9c..7d5daada 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl @@ -25,6 +25,8 @@ roleExamples--> <#assign acMultipleTypes = "'true'" /> <#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835,http://purl.org/NET/c4dm/event.owl#Event'}" /> +<#assign editTitle = "${i18n().edit_entry_for_service_provider_role}"/> +<#assign createTitle = "${i18n().create_entry_for_service_provider_role}"/> <#--Each of the two stage forms will include the form below--> <#include "addRoleToPersonTwoStage.ftl"> From ebc75d184b3b1b10d4bb1de4cdb815c7623cef9a Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 25 Oct 2018 17:52:08 +0100 Subject: [PATCH 06/22] [VIVO-1605] Update to latest Error Prone plugin and configuration to support JDK 11 (#89) * Update to latest Error Prone plugin and configuration to support JDK 11 * Update Error Prone dependency from SNAPSHOT * Add Javac version missing from Error Prone docs Partial resolution of: https://jira.duraspace.org/browse/VIVO-1605 --- installer/pom.xml | 2 +- pom.xml | 53 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/installer/pom.xml b/installer/pom.xml index 22799704..4650d6de 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -64,7 +64,7 @@ maven-compiler-plugin - 3.5.1 + 3.8.0 maven-dependency-plugin diff --git a/pom.xml b/pom.xml index 83469b14..acebfda5 100644 --- a/pom.xml +++ b/pom.xml @@ -223,6 +223,30 @@ + + + jdk8 + + 1.8 + + + 9+181-r4173-1 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + + -J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar + + + + + + @@ -269,23 +293,18 @@ 1.8 1.8 UTF-8 - javac-with-errorprone - true + + -XDcompilePolicy=simple + -Xplugin:ErrorProne + + + + com.google.errorprone + error_prone_core + 2.3.2 + + - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.8 - - - - com.google.errorprone - error_prone_core - 2.1.1 - - org.apache.maven.plugins @@ -314,7 +333,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 org.apache.maven.plugins From 54f1b04e041dd52e279b465102b1c8440421ee62 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 31 Oct 2018 11:18:54 -0400 Subject: [PATCH 07/22] Add Travis-CI Badge to README.md (#93) Resolves: https://jira.duraspace.org/browse/VIVO-1618 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c91f0de7..748733e0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # VIVO: Connect, Share, Discover +[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) + VIVO is an open source semantic web tool for research discovery -- finding people and the research they do. VIVO supports editing, searching, browsing and visualizing research activity in order to discover people, programs, From db07d321e50161b5bc1c4b584f3b94d08a1f362b Mon Sep 17 00:00:00 2001 From: Laura Wrubel Date: Wed, 5 Dec 2018 13:30:15 -0500 Subject: [PATCH 08/22] Updating AGROVOC REST API base URL. (#104) * Resolves with https://jira.duraspace.org/browse/VIVO-1655 --- .../mannlib/semservices/service/impl/AgrovocService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java index 4d78f904..945e16b9 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java @@ -58,7 +58,7 @@ public class AgrovocService implements ExternalConceptService { protected final String dbpedia_endpoint = " http://dbpedia.org/sparql"; // URL to get all the information for a concept - protected final String conceptSkosMosBase = "http://artemide.art.uniroma2.it:8081/skosmos/rest/v1/"; + protected final String conceptSkosMosBase = "http://agrovoc.uniroma2.it/agrovoc/rest/v1/"; protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?"; protected final String conceptSkosMosURL = conceptSkosMosBase + "data?"; @Override From 9580863285b185ec6075609e1d5e65c1cd9b9ee4 Mon Sep 17 00:00:00 2001 From: Laura Wrubel Date: Wed, 5 Dec 2018 14:54:09 -0500 Subject: [PATCH 09/22] [VIVO-1340] Fix links to documentation in runtime.properties (#98) Resolves: https://jira.duraspace.org/browse/VIVO-1340 --- .../resources/config/example.runtime.properties | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index 3a5c862e..f665b0fc 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -7,6 +7,11 @@ # Save a copy of this file as runtime.properties in your VIVO home directory, # and edit the properties as needed for your installation. # +# For more information on specific properties, see the configuration reference +# or installation options section of the technical documentation for the +# version of VIVO you are running: +# https://wiki.duraspace.org/display/VIVO/VIVO+Technical+Documentation +# # ----------------------------------------------------------------------------- @@ -295,8 +300,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # # When the following flag is set to enabled, the VIVO home page displays a # global map highlighting the geographical focus of foaf:person individuals. - # For information on the maps, refer to this wiki page: - # https://wiki.duraspace.org/x/c4XVAw # #homePage.geoFocusMaps=enabled @@ -306,9 +309,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # and a "quick" page view that emphasizes the individual's webpage presence. # Implementing this feature requires an installation to develop a web service # that captures images of web pages or to use an existing service outside of VIVO. - # - # For more information on implementing multiple profile pages, refer to this - # wiki page: https://wiki.duraspace.org/x/doXVAw # #multiViews.profilePageTypes=enabled @@ -317,9 +317,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # Tell VIVO to generate HTTP headers on its responses to facilitate caching the # profile pages that it creates. # - # For more information, see this wiki page: - # https://wiki.duraspace.org/x/5sQQAg - # # Developers will likely want to leave caching disabled, since a change to a # Freemarker template or to a Java class would not cause the page to be # considered stale. From fda5e8310219868e371e5d7207fc885e9b4dec6e Mon Sep 17 00:00:00 2001 From: Mike Conlon Date: Wed, 5 Dec 2018 15:02:22 -0500 Subject: [PATCH 10/22] [VIVO 1647] - Improve AgrovocService.java using diamond operator (#97) * Use diamond operator on ArrayList declarations * Use the diamond operator to simpplify declarations Resolves: https://jira.duraspace.org/browse/VIVO-1647 --- .../semservices/service/impl/AgrovocService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java index 945e16b9..e6ebe67a 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java @@ -63,7 +63,7 @@ public class AgrovocService implements ExternalConceptService { protected final String conceptSkosMosURL = conceptSkosMosBase + "data?"; @Override public List getConcepts(String term) throws Exception { - List conceptList = new ArrayList(); + List conceptList = new ArrayList<>(); //For the RDF webservices mechanism, utilize the following /* @@ -86,7 +86,7 @@ public class AgrovocService implements ExternalConceptService { return conceptList; int conceptCounter = 0; - HashSet encounteredURI = new HashSet(); + HashSet encounteredURI = new HashSet<>(); // Loop through each of these URIs and load using the SKOSManager for (String conceptUri : conceptUris) { @@ -185,7 +185,7 @@ public class AgrovocService implements ExternalConceptService { public List getConceptsByURIWithSparql(String uri) throws Exception { // deprecating this method...just return an empty list - List conceptList = new ArrayList(); + List conceptList = new ArrayList<>(); return conceptList; } @@ -227,7 +227,7 @@ public class AgrovocService implements ExternalConceptService { // When utilizing the getTermExpansion method, will get a list of URIs back // and not just one URI protected List getConceptURIsListFromRDF(String rdf) { - List conceptUris = new ArrayList(); + List conceptUris = new ArrayList<>(); try { Document doc = XMLUtils.parse(rdf); NodeList nodes = doc.getElementsByTagName("skos:Concept"); @@ -262,21 +262,21 @@ public class AgrovocService implements ExternalConceptService { + "> rdfs:comment ?description . \n" + "FILTER (LANG(?description)='en' ) \n" + "}"; // System.out.println(qs); - List resultList = new ArrayList(); + List resultList = new ArrayList<>(); QueryExecution qexec = null; try { Query query = QueryFactory.create(qs); qexec = QueryExecutionFactory.sparqlService(this.dbpedia_endpoint, query); qexec.setTimeout(5000, TimeUnit.MILLISECONDS); - resultList = new ArrayList(); + resultList = new ArrayList<>(); ResultSet resultSet = qexec.execSelect(); int resultSetSize = 0; while (resultSet.hasNext()) { resultSetSize++; QuerySolution solution = resultSet.nextSolution(); Iterator varnames = solution.varNames(); - HashMap hm = new HashMap(); + HashMap hm = new HashMap<>(); while (varnames.hasNext()) { String name = (String) varnames.next(); RDFNode rdfnode = solution.get(name); @@ -374,7 +374,7 @@ public class AgrovocService implements ExternalConceptService { //JSON-LD array private List getConceptURIsListFromSkosMosResult(String results) { - List conceptURIs = new ArrayList(); + List conceptURIs = new ArrayList<>(); ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results); //Format should be: { ..."results":["uri":uri...] if (json.has("results")) { From 3af36c7cf45780f6d6978a82568d355d0fae9b74 Mon Sep 17 00:00:00 2001 From: William Welling Date: Thu, 6 Dec 2018 09:51:13 -0600 Subject: [PATCH 11/22] corrected pom in order to template child module build number (#106) Resolves: https://jira.duraspace.org/browse/VIVO-1607 Supersedes: https://github.com/vivo-project/VIVO/pull/91 --- pom.xml | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index acebfda5..eee33cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -167,18 +179,6 @@ ${javadoc.opts} - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-gpg-plugin @@ -202,24 +202,6 @@ true - - org.codehaus.mojo - buildnumber-maven-plugin - - - validate - - create - - - - - false - false - 7 - Detached - - @@ -306,6 +288,24 @@ + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + 7 + Detached + + org.apache.maven.plugins maven-site-plugin From 7a963c2ef93f75942cf60b88f75c4c29bbc3194d Mon Sep 17 00:00:00 2001 From: Stefan-Wolff Date: Fri, 7 Dec 2018 15:15:25 +0100 Subject: [PATCH 12/22] [VIVO-1528] annotate fields for HTML editing (#100) * annotate fields for HTML editing Resolves: https://jira.duraspace.org/browse/VIVO-1528 --- .../rdf/tbox/firsttime/vitroAnnotations.n3 | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 index 0c20ae08..c23d014e 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 @@ -1730,7 +1730,9 @@ vivo:outreachOverview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "Please enter a single summary narrative of your outreach goals and/or contributions"^^xsd:string . + "Please enter a single summary narrative of your outreach goals and/or contributions"^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . obo:ERO_0000031 vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1912,7 +1914,9 @@ bibo:abstract vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "A summary of the resource."^^xsd:string . + "A summary of the resource."^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:PrincipalInvestigatorRole vitro:displayLimitAnnot @@ -2141,7 +2145,9 @@ vivo:teachingOverview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "Please enter a single narrative summary description of your teaching activities, goals, and/or experience"^^xsd:string . + "Please enter a single narrative summary description of your teaching activities, goals, and/or experience"^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:rank vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -2268,7 +2274,9 @@ vivo:overview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "A short narrative summary to be used as a single descriptive overview statement."^^xsd:string . + "A short narrative summary to be used as a single descriptive overview statement."^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:description vitro:displayLimitAnnot @@ -5405,7 +5413,9 @@ vivo:researchOverview vitro:inPropertyGroupAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + ; + vitro:editing + "HTML"^^xsd:string . obo:ERO_0000390 vitro:displayLimitAnnot From 4b2a2c1bd81250dedbc363ff2173b6ca61699075 Mon Sep 17 00:00:00 2001 From: gneissone Date: Thu, 6 Dec 2018 13:36:57 -0700 Subject: [PATCH 13/22] Fix validation on personHasAdvisorRelationship.ftl --- .../freemarker/edit/forms/personHasAdvisorRelationship.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl index cd83bc63..bc2bcfe2 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl @@ -114,7 +114,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o <#else>