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/10/20 04:39:35 UTC
svn commit: r706109 -
/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
Author: hansbak
Date: Sun Oct 19 19:39:34 2008
New Revision: 706109
URL: http://svn.apache.org/viewvc?rev=706109&view=rev
Log:
partly revert of previous commit
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=706109&r1=706108&r2=706109&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Sun Oct 19 19:39:34 2008
@@ -143,19 +143,10 @@
<!-- TASK -->
<if-compare field="sec_object" value="TASK" operator="equals">
- <if-not-empty field="parameters.workEffortParentId">
+ <set field="taskId" from-field="parameters.taskId" default-value="${parameters.workEffortId}"/>
+ <if-empty field="taskId">
<set field="phaseId" from-field="parameters.workEffortParentId"/>
- <else>
- <if-not-empty field="parameters.taskId">
- <set field="taskId" from-field="parameters.taskId"/>
- <else>
- <if-not-empty field="parameters.workEffortId">
- <set field="taskId" from-field="parameters.workEfortId"/>
- </if-not-empty>
- </else>
- </if-not-empty>
- </else>
- </if-not-empty>
+ </if-empty>
<set field="partyId" from-field="parameters.userLogin.partyId"/>
<!--call-simple-method method-name="checkProjectMembership"/-->
<!-- log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId: ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription} isMember: ${isMember}"/-->