litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rel-1.12.0-alpha' of https://github.com/vivo-project/VIVO into rel-1.12.0-alpha

Browse source
This commit is contained in:
Brian Lowe 2021-05-03 19:35:17 +03:00
commit fe764ded51
5 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
home/src/main/resources/config/example.runtime.properties
View file

@ -407,7 +407,15 @@ Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Ro
# If you do not wish to use the claiming interface, set this property to nothing (empty)
createAndLink.providers = doi, pmid
# Triple pattern fragments is a very fast, very simple means for querying a triple store.
# The triple pattern fragments API in VIVO puts little load on the server, providing a simple means for getting data from the triple store. The API has a web interface for manual use, can be used from the command line via curl, and can be used by programs.
# Triple Pattern Fragments is a very fast, very simple means for querying a
# triple store. The Triple Pattern Fragments API in VIVO puts little load on
# the server, providing a simple means for getting data from the triple store.
# The API has a web interface for manual use, can be used from the command
# line via curl, and can be used by programs.
#
# VIVO's Triple Pattern Fragments API does not require authentication and
# makes the full RDF graph available regardless of display or publish levels
# set on particular properties. Enable Triple Pattern Fragments only if your
# VIVO does not contain restricted data that should not be shared with others.
#
# tpf.activeFlag = true

16
home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
View file

@ -117,6 +117,22 @@
}
""" .
# URI finder that will find the relevant person to update when the
# property linking to the email or preferred title resource is removed
:vivoUriFinder_VCard_2
a searchIndex:indexing.IndexingUriFinder ,
searchIndex:indexing.SelectQueryUriFinder ;
rdfs:label "Preferred title / email person URI finder #2" ;
:hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#hasTitle" ;
:hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#hasEmail" ;
:hasSelectQuery """
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT ?uri
WHERE {
?uri obo:ARG_2000028 ?subject .
}
""" .
:vivodocumentModifier_PreferredTitle
a searchIndex:documentBuilding.SelectQueryDocumentModifier ,
searchIndex:documentBuilding.DocumentModifier ;

4
home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3
View file

@ -5071,7 +5071,9 @@ vivo:governingAuthorityFor
vitro:displayRankAnnot
"70"^^xsd:int ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
<http://vivoweb.org/ontology#vitroPropertyGroupaddress> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
geo:agriculturalAreaYear
vitro:hiddenFromDisplayBelowRoleLevelAnnot

4
webapp/src/main/webapp/js/visualization/entitycomparison/util.js
View file

@ -1069,7 +1069,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
// console.log(processJSONData.currentEntityLevel);
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) {
$.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations);
}
@ -1193,7 +1193,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
*/
function reloadDataTablePagination(preselectedEntityURIs, jsonData){
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) {
/*
* This will make sure that duplicate filters are not added.

6
webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
View file

@ -34,7 +34,7 @@
<#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'>
<#assign publicationParameter = { "name": "${i18n().publication?js_string}",
<#assign publicationParameter = { "name": "publication",
"pluralName": "${i18n().publications?js_string}",
"verbName": "${i18n().published?js_string}",
"dropDownText": "${i18n().by_publications?js_string}",
@ -44,7 +44,7 @@
"csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison",
"value": "${i18n().publications?js_string}" }>
<#assign grantParameter = { "name": "${i18n().grant?js_string}",
<#assign grantParameter = { "name": "grant",
"pluralName": "${i18n().grants?js_string}",
"verbName": "${i18n().granted?js_string}",
"dropDownText": "${i18n().by_grants?js_string}",
@ -74,7 +74,7 @@ var activitiesLabel = {
plural: '${i18n().activities?js_string}'
};
var i18nStringsGuiEvents = {
temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string},
temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}',
temporalGraphLower: '${i18n().temporal_graph?js_string?js_string}',
viewString: '${i18n().view?js_string}',
entityMaxNote: '${i18n().max_entity_note?js_string}',