[Fmsystem-commits] [11828] property: adjust acl rights for .project

[Sigurd Nes]

Revision: 11828
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11828
Author:   sigurdne
Date:     2014-03-15 13:55:41 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
property: adjust acl rights for .project

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2014-03-14 16:21:38 UTC (rev 
11827)
+++ trunk/property/inc/class.uiproject.inc.php  2014-03-15 13:55:41 UTC (rev 
11828)
@@ -91,6 +91,7 @@
                        $this->acl_add                  = 
$this->acl->check('.project', PHPGW_ACL_ADD, 'property');
                        $this->acl_edit                 = 
$this->acl->check('.project', PHPGW_ACL_EDIT, 'property');
                        $this->acl_delete               = 
$this->acl->check('.project', PHPGW_ACL_DELETE, 'property');
+                       $this->acl_manage               = 
$this->acl->check('.project', 16, 'property');
 
                        $this->start                    = $this->bo->start;
                        $this->query                    = $this->bo->query;
@@ -1185,17 +1186,20 @@
 
                                        
if(isset($config->config_data['invoice_acl']) && 
$config->config_data['invoice_acl'] == 'dimb')
                                        {
-                                               if(!isset($values['ecodimb']) 
|| !$values['ecodimb'])
+                                               if(!$this->acl_manage)
                                                {
-                                                       
$receipt['error'][]=array('msg'=>lang('Please select dimb!'));
-                                                       $error_id=true;
-                                               }
+                                                       
if(!isset($values['ecodimb']) || !$values['ecodimb'])
+                                                       {
+                                                               
$receipt['error'][]=array('msg'=>lang('Please select dimb!'));
+                                                               $error_id=true;
+                                                       }
 
-                                               $approve_role = 
execMethod('property.boinvoice.check_role', $values['ecodimb']);
-                                               if( 
!$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
-                                               {
-                                                       
$receipt['error'][]=array('msg'=>lang('you are not approved for this dimb: %1', 
$values['ecodimb'] ));
-                                                       $error_id=true;
+                                                       $approve_role = 
execMethod('property.boinvoice.check_role', $values['ecodimb']);
+                                                       if( 
!$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
+                                                       {
+                                                               
$receipt['error'][]=array('msg'=>lang('you are not approved for this dimb: %1', 
$values['ecodimb'] ));
+                                                               $error_id=true;
+                                                       }
                                                }
                                        }
 

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2014-03-14 16:21:38 UTC 
(rev 11827)
+++ trunk/property/inc/class.uiworkorder.inc.php        2014-03-15 13:55:41 UTC 
(rev 11828)
@@ -88,6 +88,7 @@
                        $this->acl_add                          = 
$this->acl->check('.project', PHPGW_ACL_ADD, 'property');
                        $this->acl_edit                         = 
$this->acl->check('.project', PHPGW_ACL_EDIT, 'property');
                        $this->acl_delete                       = 
$this->acl->check('.project', PHPGW_ACL_DELETE, 'property');
+                       $this->acl_manage                       = 
$this->acl->check('.project', 16, 'property');
 
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
@@ -1017,21 +1018,24 @@
 
                                if(isset($config->config_data['invoice_acl']) 
&& $config->config_data['invoice_acl'] == 'dimb')
                                {
-                                       $approve_role = 
execMethod('property.boinvoice.check_role', $project['ecodimb'] ? 
$project['ecodimb'] : $values['ecodimb']);
-                                       if(!$approve_role['is_janitor'] && 
!$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
+                                       if(!$this->acl_manage)
                                        {
-                                               
$receipt['error'][]=array('msg'=>lang('you are not approved for this dimb: %1', 
$project['ecodimb'] ? $project['ecodimb'] : $values['ecodimb'] ));
-                                               $error_id=true;
-                                       }
-
-                                       if(isset($values['approved']) && 
$values['approved'] && (!isset($values['approved_orig']) || ! 
$values['approved_orig']))
-                                       {
-                                               
if(!$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
+                                               $approve_role = 
execMethod('property.boinvoice.check_role', $project['ecodimb'] ? 
$project['ecodimb'] : $values['ecodimb']);
+                                               if(!$approve_role['is_janitor'] 
&& !$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
                                                {
-                                                       
$receipt['error'][]=array('msg'=>lang('you do not have permission to approve 
this order') );
-                                                       $values['approved'] = 
false;
+                                                       
$receipt['error'][]=array('msg'=>lang('you are not approved for this dimb: %1', 
$project['ecodimb'] ? $project['ecodimb'] : $values['ecodimb'] ));
                                                        $error_id=true;
                                                }
+
+                                               if(isset($values['approved']) 
&& $values['approved'] && (!isset($values['approved_orig']) || ! 
$values['approved_orig']))
+                                               {
+                                                       
if(!$approve_role['is_supervisor'] && ! $approve_role['is_budget_responsible'])
+                                                       {
+                                                               
$receipt['error'][]=array('msg'=>lang('you do not have permission to approve 
this order') );
+                                                               
$values['approved'] = false;
+                                                               $error_id=true;
+                                                       }
+                                               }
                                        }
                                }