Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-12-11 12:01:13 -05:00
commit 4af9207baa

View file

@ -524,6 +524,8 @@ local:adviseeRoleContext a :ConfigContext ;
local:adviseeRoleConfig a :ObjectPropertyDisplayConfig ; local:adviseeRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-adviseeIn.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-adviseeIn.xml"^^xsd:string ;
:displayName "advisee of" ; :displayName "advisee of" ;
vitro:collateBySubclassAnnot
"true"^^xsd:boolean;
vitro:displayRankAnnot 30; vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;