You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/01/03 16:14:35 UTC
svn commit: r608520 - in /ofbiz/trunk/specialpurpose/projectmgr:
data/ProjectMgrSecurityData.xml widget/Menus.xml widget/TaskScreens.xml
Author: hansbak
Date: Thu Jan 3 07:14:34 2008
New Revision: 608520
URL: http://svn.apache.org/viewvc?rev=608520&view=rev
Log:
some security updates and my taskscreen enhancements
Modified:
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml?rev=608520&r1=608519&r2=608520&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml Thu Jan 3 07:14:34 2008
@@ -38,7 +38,6 @@
<SecurityGroup description="Project User group, has only access to own projects." groupId="PROJECTUSER"/>
<SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_VIEW"/>
- <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_UPDATE"/>
<SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_VIEW"/>
<SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_TASK_CREATE"/>
<SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_TIMESHEET_CREATE"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=608520&r1=608519&r2=608520&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Thu Jan 3 07:14:34 2008
@@ -28,26 +28,26 @@
<menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask"/></menu-item>
<menu-item name="resources" title="${uiLabelMap.ProjectMgrResources}">
<condition>
- <if-has-permission permission="PARTYMGR_ADMIN"/>
+ <if-has-permission permission="PROJECTMGR_ADMIN"/>
</condition>
<link target="FindResource"/>
</menu-item>
<menu-item name="timesheet" title="${uiLabelMap.Timesheet}">
<condition>
- <if-has-permission permission="PARTYMGR_ADMIN"/>
+ <if-has-permission permission="PROJECTMGR_ADMIN"/>
</condition>
<link target="FindTimeSheet"/>
</menu-item>
<menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}">
<condition>
- <if-has-permission permission="PARTYMGR_ADMIN"/>
+ <if-has-permission permission="PROJECTMGR_ADMIN"/>
</condition>
<link target="findSkillTypes"/>
</menu-item>
<!--menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item-->
<menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}">
<condition>
- <if-has-permission permission="PARTYMGR_ADMIN"/>
+ <if-has-permission permission="PROJECTMGR_ADMIN"/>
</condition>
<link target="requestlist"/>
</menu-item>
@@ -70,20 +70,20 @@
</actions>
<menu-item name="ganttchart" title="${uiLabelMap.ProjectMgrGanttChart}">
<condition>
- <if-has-permission permission="PARTYMGR_VIEW"/>
+ <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
</condition>
<link target="ganttChart?projectId=${projectId}"/>
</menu-item>
<menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}">
<condition>
- <if-has-permission permission="PARTYMGR_VIEW"/>
+ <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
</condition>
<link target="projectView?projectId=${projectId}"/>
</menu-item>
<menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -94,7 +94,7 @@
<menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -105,7 +105,7 @@
<menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -116,7 +116,7 @@
<menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -127,7 +127,7 @@
<menu-item name="notes" title="${uiLabelMap.CommonNotes}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -138,7 +138,7 @@
<menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -149,7 +149,7 @@
<menu-item name="billing" title="${uiLabelMap.ProjectMgrBilling}">
<condition>
<and>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
<if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
@@ -168,7 +168,7 @@
<not>
<if-empty field-name="project"/>
</not>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
</and>
</condition>
<link target="EditProject"></link>
@@ -179,7 +179,7 @@
<not>
<if-empty field-name="project"/>
</not>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
</and>
</condition>
<link target="copyProject?projectId=${projectId}"></link>
@@ -190,7 +190,7 @@
<not>
<if-empty field-name="project"/>
</not>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
</and>
</condition>
<link target="scheduleProject?projectId=${projectId}"></link>
@@ -201,7 +201,7 @@
<not>
<if-empty field-name="project"/>
</not>
- <if-has-permission permission="PARTYMGR_ROLE_UPDATE"/>
+ <if-has-permission permission="PROJECTMGR" action="_ROLE_UPDATE"/>
</and>
</condition>
<link target="copyProjectToTemplate?projectId=${projectId}"></link>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=608520&r1=608519&r2=608520&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jan 3 07:14:34 2008
@@ -135,23 +135,37 @@
<include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</container>
</container-->
- <container style="lefthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAssignATaskToMe}</label></container>
- <container style="screenlet-body">
- <include-form name="assignTaskToMe" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </container>
- </container>
- </container>
- <container style="righthalf">
-
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAddNewTask}</label></container>
- <container style="screenlet-body">
- <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </container>
- </container>
- </container>
+ <section>
+ <condition>
+ <not><if-empty field-name="projects"/></not>
+ </condition>
+ <widgets>
+ <container style="lefthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAssignATaskToMe}</label></container>
+ <container style="screenlet-body">
+ <include-form name="assignTaskToMe" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAddNewTask}</label></container>
+ <container style="screenlet-body">
+ <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAssignATaskToMe}</label></container>
+ <container style="screenlet-body">
+ <label style="head3" text="You are'nt member of any project, contact your project manager."></label>
+ </container>
+ </container>
+ </fail-widgets>
+ </section>
</widgets>
</section>
</decorator-section>