Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-11-20 15:14:05 -05:00
commit 08969ad593
2 changed files with 16 additions and 0 deletions

View file

@ -33,6 +33,7 @@
?award rdfs:label ?awardLabel
}
OPTIONAL { ?awardReceipt core:relates ?givenTo .
?givenTo a foaf:Person .
?givenTo rdfs:label ?givenToLabel
}
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
@ -64,6 +65,7 @@
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?awardReceipt core:relates ?givenTo .
?givenTo a foaf:Person .
?givenTo rdfs:label ?givenToLabel .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime

View file

@ -1282,6 +1282,20 @@ local:awardOrHonorGivenConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:awardConferredByContext a :ConfigContext ;
:hasConfiguration local:awardConferredByConfig ;
:configContextFor <http://vivoweb.org/ontology/core#assignedBy> ;
:qualifiedByDomain <http://vivoweb.org/ontology/core#AwardReceipt> ;
:qualifiedBy <http://xmlns.com/foaf/0.1/Organization> .
local:awardConferredByConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "award conferred by" ;
vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:orgAwardsGrantContext a :ConfigContext ;
:hasConfiguration local:orgAwardsGrantConfig ;
:configContextFor <http://vivoweb.org/ontology/core#assigns> ;