[Fmsystem-commits] [17299] helpdesk, finetune acl

[sigurdne]

Revision: 17299
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17299
Author:   sigurdne
Date:     2017-11-13 04:49:03 -0500 (Mon, 13 Nov 2017)
Log Message:
-----------
helpdesk, finetune acl

Modified Paths:
--------------
    trunk/helpdesk/inc/class.menu.inc.php
    trunk/helpdesk/inc/class.sogeneric.inc.php
    trunk/helpdesk/setup/default_records.inc.php
    trunk/helpdesk/setup/setup.inc.php
    trunk/helpdesk/setup/tables_update.inc.php

Modified: trunk/helpdesk/inc/class.menu.inc.php
===================================================================
--- trunk/helpdesk/inc/class.menu.inc.php       2017-11-12 17:03:08 UTC (rev 
17298)
+++ trunk/helpdesk/inc/class.menu.inc.php       2017-11-13 09:49:03 UTC (rev 
17299)
@@ -193,7 +193,7 @@
 
 
 
-                       if ( $acl->check('.ticket',PHPGW_ACL_PRIVATE, 
'helpdesk') ) //manage
+                       if ( 
$acl->check('.ticket.response_template',PHPGW_ACL_READ, 'helpdesk') ) //manage
                        {
                                $menus['navigation']['response_template'] = 
array
                                        (
@@ -202,7 +202,10 @@
                                        'text' => lang('response template'),
                                        'image' => array('helpdesk', 'helpdesk')
                                );
+                       }
 
+                       if ( $acl->check('.email_out',PHPGW_ACL_READ, 
'helpdesk') ) //manage
+                       {
                                $menus['navigation']['email_out'] = array(
                                        'text' => lang('email out'),
                                        'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'helpdesk.uiemail_out.index')),

Modified: trunk/helpdesk/inc/class.sogeneric.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sogeneric.inc.php  2017-11-12 17:03:08 UTC (rev 
17298)
+++ trunk/helpdesk/inc/class.sogeneric.inc.php  2017-11-13 09:49:03 UTC (rev 
17299)
@@ -145,7 +145,7 @@
                                                'name' => lang('response 
template'),
                                                'acl_app' => 'helpdesk',
                                                'system_location' => 
'.ticket.response_template',
-                                               'acl_location' => '.ticket',
+                                               'acl_location' => 
'.ticket.response_template',
                                                'menu_selection' => 
'helpdesk::response_template',
                                                'default' => array
                                                        (

Modified: trunk/helpdesk/setup/default_records.inc.php
===================================================================
--- trunk/helpdesk/setup/default_records.inc.php        2017-11-12 17:03:08 UTC 
(rev 17298)
+++ trunk/helpdesk/setup/default_records.inc.php        2017-11-13 09:49:03 UTC 
(rev 17299)
@@ -32,5 +32,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr, allow_grant, allow_c_function, allow_c_attrib, c_attrib_table) 
VALUES ({$app_id}, '.ticket', 'Helpdesk', 1, 1, 1, 'phpgw_helpdesk_tickets')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr) VALUES ({$app_id}, '.ticket.order', 'Helpdesk ad hock order')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr) VALUES ({$app_id}, '.custom', 'Custom reports')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr) VALUES ({$app_id}, '.ticket.response_template', 'Ticket response 
template')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr) VALUES ({$app_id}, '.email_out', 'email out')");
 
 $GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE 
config_app='helpdesk'");

Modified: trunk/helpdesk/setup/setup.inc.php
===================================================================
--- trunk/helpdesk/setup/setup.inc.php  2017-11-12 17:03:08 UTC (rev 17298)
+++ trunk/helpdesk/setup/setup.inc.php  2017-11-13 09:49:03 UTC (rev 17299)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['helpdesk']['name']                 = 'helpdesk';
-       $setup_info['helpdesk']['version']              = '0.9.18.005';
+       $setup_info['helpdesk']['version']              = '0.9.18.006';
        $setup_info['helpdesk']['app_order']    = 8;
        $setup_info['helpdesk']['enable']               = 1;
        $setup_info['helpdesk']['app_group']    = 'office';

Modified: trunk/helpdesk/setup/tables_update.inc.php
===================================================================
--- trunk/helpdesk/setup/tables_update.inc.php  2017-11-12 17:03:08 UTC (rev 
17298)
+++ trunk/helpdesk/setup/tables_update.inc.php  2017-11-13 09:49:03 UTC (rev 
17299)
@@ -237,4 +237,21 @@
                        $GLOBALS['setup_info']['helpdesk']['currentver'] = 
'0.9.18.005';
                        return $GLOBALS['setup_info']['helpdesk']['currentver'];
                }
-       }
\ No newline at end of file
+       }
+
+       /**
+       * Update helpdesk version from 0.9.18.005 to 0.9.18.006
+       */
+       $test[] = '0.9.18.005';
+
+       function helpdesk_upgrade0_9_18_005()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               $GLOBALS['phpgw']->locations->add('.ticket.response_template', 
'email out', 'helpdesk');
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['helpdesk']['currentver'] = 
'0.9.18.006';
+                       return $GLOBALS['setup_info']['helpdesk']['currentver'];
+               }
+       }