svn commit: r1087602 - in /ofbiz/branches: release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml

[sascharodekamp]

Author: sascharodekamp
Date: Fri Apr  1 06:56:51 2011
New Revision: 1087602

URL: http://svn.apache.org/viewvc?rev=1087602&view=rev
Log:
Bug - Unable to create project task contents as admin (https://issues.apache.org/jira/browse/OFBIZ-3952). Apllied Jeremys modified patch. Just add an extra permission check for the PROJECT_ADMIN permission.

Orig.Msg.
When editing a task in the project manager application you cannot add content from the content tab if you have admin privileges. The permission is incorrectly labeled as "PROJECTMGR_ROLE_ADMIN" when it should be "PROJECTMGR_ADMIN."

Modified:
    ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1087602&r1=1087601&r2=1087602&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Apr  1 06:56:51 2011
@@ -532,6 +532,7 @@ under the License.
                         <section>
                             <condition>
                                 <or>
+                                    <if-has-permission permission="PROJECTMGR_ADMIN"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_ADMIN"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_TASK_CREATE"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_UPDATE"/>

Modified: ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1087602&r1=1087601&r2=1087602&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Apr  1 06:56:51 2011
@@ -312,7 +312,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="ViewProjectTask">
         <section>
             <actions>
@@ -343,7 +343,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="TaskView">
         <section>
             <actions>
@@ -515,6 +515,7 @@ under the License.
                         <section>
                             <condition>
                                 <or>
+                                    <if-has-permission permission="PROJECTMGR_ADMIN"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_ADMIN"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_TASK_CREATE"/>
                                     <if-has-permission permission="PROJECTMGR_ROLE_UPDATE"/>