[Fmsystem-commits] [16448] more on eventplanner

[sigurdne]

Revision: 16448
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16448
Author:   sigurdne
Date:     2017-03-17 11:23:26 -0400 (Fri, 17 Mar 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/model/class.vendor.inc.php
    trunk/phpgwapi/inc/class.uicommon.inc.php

Modified: trunk/eventplanner/inc/model/class.vendor.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.vendor.inc.php   2017-03-16 17:59:16 UTC 
(rev 16447)
+++ trunk/eventplanner/inc/model/class.vendor.inc.php   2017-03-17 15:23:26 UTC 
(rev 16448)
@@ -101,6 +101,7 @@
                                        'label' => 'id',
                                        'sortable'=> true,
                                        'formatter' => 
'JqueryPortico.formatLink',
+                                       'public'        => true
                                        ),
                                'owner_id' => array('action'=> PHPGW_ACL_ADD,
                                        'type' => 'int',
@@ -130,6 +131,7 @@
                                        'label' => 'name',
                                        'required' => true,
                                        'query' => true,
+                                       'public'        => true
                                        ),
                                'address_1' => array('action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
                                        'type' => 'string',
@@ -186,7 +188,8 @@
                                        'required' => true,
                                        'query' => true,
                                        'sf_validator' => 
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(), 
array('invalid' => '%field% is invalid')),
-                                       'label' => 'organization number'
+                                       'label' => 'organization number',
+                                       'public'        => true
                                        ),
                        );
 

Modified: trunk/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon.inc.php   2017-03-16 17:59:16 UTC (rev 
16447)
+++ trunk/phpgwapi/inc/class.uicommon.inc.php   2017-03-17 15:23:26 UTC (rev 
16448)
@@ -214,7 +214,7 @@
 
                private function get_data($relaxe_acl = false)
                {
-                       if (empty($this->permissions[PHPGW_ACL_READ]))
+                       if (!$relaxe_acl && 
empty($this->permissions[PHPGW_ACL_READ]))
                        {
                                phpgw::no_access();
                        }
@@ -248,7 +248,7 @@
                 */
                public function get_list()
                {
-                       $values = $this->get_data();
+                       $values = $this->get_data(true);
 
                        $results = array();
                        foreach ($values['results'] as $row)