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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
j2blake 2013-11-20 17:07:04 -05:00
commit f3999dd48f
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rdf/display/everytime/PropertyConfig.n3
View file

@ -1279,7 +1279,7 @@ local:awardOrHonorGivenConfig a :ObjectPropertyDisplayConfig ;
:displayName "award or honor given" ; :displayName "award or honor given" ;
vitro:displayRankAnnot 72; vitro:displayRankAnnot 72;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:awardConferredByContext a :ConfigContext ; local:awardConferredByContext a :ConfigContext ;

2
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -186,7 +186,7 @@ vivo:yearPrecision
rdfs:label "year value"@en-US . rdfs:label "year value"@en-US .
vivo:assigneeFor vivo:assigneeFor
rdfs:label "assignee for"@en-US ; rdfs:label "assignee for patent"@en-US ;
vitro:displayLimitAnnot vitro:displayLimitAnnot
"5"^^xsd:int ; "5"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot

4
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
View file

@ -17,9 +17,9 @@ public class SiteAdminController extends BaseSiteAdminController {
private static final Log log = LogFactory.getLog(SiteAdminController.class); private static final Log log = LogFactory.getLog(SiteAdminController.class);
@Override @Override
protected Map<String, String> getIndexCacheRebuildUrls(VitroRequest vreq) { protected Map<String, String> getSiteMaintenanceUrls(VitroRequest vreq) {
Map<String, String> urls = super.getIndexCacheRebuildUrls(vreq); Map<String, String> urls = super.getSiteMaintenanceUrls(vreq);
if (PolicyHelper.isAuthorizedForActions(vreq, ToolsRequestHandler.REQUIRED_ACTIONS)) { if (PolicyHelper.isAuthorizedForActions(vreq, ToolsRequestHandler.REQUIRED_ACTIONS)) {
urls.put("rebuildVisCache", UrlBuilder.getUrl("/vis/tools")); urls.put("rebuildVisCache", UrlBuilder.getUrl("/vis/tools"));