fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [7632]


From: Torstein
Subject: [Fmsystem-commits] [7632]
Date: Fri, 16 Sep 2011 09:24:52 +0000

Revision: 7632
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7632
Author:   vator
Date:     2011-09-16 09:24:51 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicommon.inc.php

Modified: trunk/controller/inc/class.uicommon.inc.php
===================================================================
--- trunk/controller/inc/class.uicommon.inc.php 2011-09-16 09:24:40 UTC (rev 
7631)
+++ trunk/controller/inc/class.uicommon.inc.php 2011-09-16 09:24:51 UTC (rev 
7632)
@@ -126,7 +126,6 @@
                        
self::add_stylesheet('phpgwapi/js/yahoo/treeview/assets/skins/sam/treeview.css');
                        
//self::add_stylesheet('controller/templates/base/css/base.css');
                        self::add_javascript('controller', 'yahoo', 
'common.js');
-                       self::add_javascript('controller', 'controller', 
'common.js');
                        $this->tmpl_search_path = array();
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/base');
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']);
@@ -222,8 +221,8 @@
                 * @param $permission
                 * @return true if check is ok, false othewise
                 */
-               protected function hasPermissionOn($location = 
activitycalendar_uicommon::LOCATION_ROOT, $permission = PHPGW_ACL_PRIVATE){
-                       return 
$this->acl->check($location,$permission,'bkbooking');
+               protected function hasPermissionOn($location = 
controller_uicommon::LOCATION_ROOT, $permission = PHPGW_ACL_PRIVATE){
+                       return 
$this->acl->check($location,$permission,'controller');
                }
                
                




reply via email to

[Prev in Thread] Current Thread [Next in Thread]