[elvystrac] r1853 - competency upgraded
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Wed, 24 Feb 2010 17:42:28 +0100
Author: DavidK
Date: 2010-02-24 17:42:28 +0100 (Wed, 24 Feb 2010)
New Revision: 1853
Modified:
trunk/server/webServer2/WebContent/template/elvys-template.xhtml
Log:
competency upgraded
Modified: trunk/server/webServer2/WebContent/template/elvys-template.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-02-24 16:33:45 UTC (rev 1852)
+++ trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-02-24 16:42:28 UTC (rev 1853)
@@ -94,21 +94,24 @@
</rich:dropDownMenu>
<!-- CATEGORIES -->
- <rich:dropDownMenu id="CategoryMenu"
value="#{lbl['template.menu.category']}" disabled="false">
- <rich:menuItem
id="CategoryListMenuItem"
-
value="#{lbl['template.menu.category.list']}"
-
action="#{catDefListBean.prepareList}"
-
submitMode="server"/>
- <rich:menuItem
id="CategoryCreateMenuItem"
-
value="#{lbl['template.menu.category.create']}"
-
action="#{catDefEditBean.prepareCreateForm}"
-
submitMode="server"/>
+ <rich:dropDownMenu id="CategoryMenu"
+
value="#{lbl['template.menu.category']}"
+
rendered="#{user.competency.canManageCategories}">
-
+ <rich:menuItem
id="CategoryListMenuItem"
+
value="#{lbl['template.menu.category.list']}"
+
action="#{catDefListBean.prepareList}"
+ submitMode="server"/>
+ <rich:menuItem
id="CategoryCreateMenuItem"
+
value="#{lbl['template.menu.category.create']}"
+
action="#{catDefEditBean.prepareCreateForm}"
+ submitMode="server"/>
</rich:dropDownMenu>
+
+ <!-- ELVYSES -->
<rich:dropDownMenu id="ElvysMenu"
value="#{lbl['template.menu.elvys']}"
- disabled="false">
+
rendered="#{user.competency.canManageElvyses or user.competency.canPlan}">
<rich:menuItem
id="ListOfElvyses"
value="#{lbl['template.menu.elvys.list']}"
action="#{elvysesBean.prepareListBeforeUC}"
@@ -186,7 +189,7 @@
<h:outputText value="${lbl['login.createdby']}" />
<div class="template-footnote-logged-user">
<elvys:userLabel id="loggedUser" value="#{user.user}"/>
- <h:outputText value=", #{user.compStrLocalized}"/>
+ <h:outputText value=", #{user.compStrLocalized},
#{user.company.name}"/>
</div>
</div>
</ui:define>
Other related posts:
- » [elvystrac] r1853 - competency upgraded - elvys
