[Fmsystem-commits] [16369] acl on parent when bypass

[sigurdne]

Revision: 16369
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16369
Author:   sigurdne
Date:     2017-02-21 15:02:55 -0500 (Tue, 21 Feb 2017)
Log Message:
-----------
acl on parent when  bypass

Modified Paths:
--------------
    trunk/phpgwapi/templates/pure/css/pure-extension.css
    trunk/property/inc/class.uientity.inc.php

Modified: trunk/phpgwapi/templates/pure/css/pure-extension.css
===================================================================
--- trunk/phpgwapi/templates/pure/css/pure-extension.css        2017-02-21 
19:20:52 UTC (rev 16368)
+++ trunk/phpgwapi/templates/pure/css/pure-extension.css        2017-02-21 
20:02:55 UTC (rev 16369)
@@ -56,7 +56,13 @@
 input[class*="pure-u"],
 textarea[class*="pure-u"],
 select[class*="pure-u"] {box-sizing: border-box;padding: 0.5em 0.6em 
!important;}
-
+/*
+textarea
+{
+       width: 235px;
+       height: 150px;
+}
+*/
 input[type="checkbox"],
 input[type="radio"] {margin-right: 2px;}
 

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2017-02-21 19:20:52 UTC (rev 
16368)
+++ trunk/property/inc/class.uientity.inc.php   2017-02-21 20:02:55 UTC (rev 
16369)
@@ -125,17 +125,13 @@
 
                        if(!empty($config['bypass_acl_at_entity']) && 
is_array($config['bypass_acl_at_entity']) && in_array($this->entity_id, 
$config['bypass_acl_at_entity']))
                        {
+                               $acl_check_location = 
".{$this->type}.$this->entity_id"; //parent
                                $this->acl_read = true;
                        }
-                       else
-                       {
-                               $this->acl_read = 
$this->acl->check($this->acl_location, PHPGW_ACL_READ, 
$this->type_app[$this->type]);
-                       }
+                       $this->acl_add = $this->acl->check($acl_check_location, 
PHPGW_ACL_ADD, $this->type_app[$this->type]);
+                       $this->acl_edit = 
$this->acl->check($acl_check_location, PHPGW_ACL_EDIT, 
$this->type_app[$this->type]);
+                       $this->acl_delete = 
$this->acl->check($acl_check_location, PHPGW_ACL_DELETE, 
$this->type_app[$this->type]);
 
-                       $this->acl_add = $this->acl->check($this->acl_location, 
PHPGW_ACL_ADD, $this->type_app[$this->type]);
-                       $this->acl_edit = 
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 
$this->type_app[$this->type]);
-                       $this->acl_delete = 
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 
$this->type_app[$this->type]);
-
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"{$this->type_app[$this->type]}::entity_{$this->entity_id}";
                        if ($this->cat_id > 0)
                        {