From ceadd179dd57427165a999f0fbd18b55a8dafd1a Mon Sep 17 00:00:00 2001 From: Rob Thomas Date: Thu, 22 Mar 2018 23:07:07 -0300 Subject: [PATCH] These ACL resources are duplicated. I'm not sure how this ever worked. I was unable to log in as an admin user, as Zend was throwing an exception about these resources already existing. 'default:addemployeleaves' was merged in e4fb891afb for example. I suspect that a bad git merge caused these, as git blame references 2.1 and 3.2 commits. Signed-Off-By: Rob Thomas --- .../modules/default/plugins/AccessControl.php | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/application/modules/default/plugins/AccessControl.php b/application/modules/default/plugins/AccessControl.php index 2616ff773..0dd87a8c6 100644 --- a/application/modules/default/plugins/AccessControl.php +++ b/application/modules/default/plugins/AccessControl.php @@ -624,30 +624,6 @@ protected function _getAcl() $acl->addResource(new Zend_Acl_Resource('default:userloginlog')); $acl->allow('admin', 'default:userloginlog', array('index','empnameauto','empidauto','empipaddressauto','empemailauto')); - $acl->addResource(new Zend_Acl_Resource('default:addemployeeleaves')); - $acl->allow('management', 'default:addemployeeleaves', array('index','add','edit','view','Add Employee Leave')); - - $acl->addResource(new Zend_Acl_Resource('default:announcements')); - $acl->allow('management', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','add','edit','delete','view','Announcements')); - - $acl->addResource(new Zend_Acl_Resource('default:appraisalcategory')); - $acl->allow('management', 'default:appraisalcategory', array('index','addpopup','getappraisalcategory','add','edit','delete','view','Parameters')); - - $acl->addResource(new Zend_Acl_Resource('default:appraisalhistoryself')); - $acl->allow('management', 'default:appraisalhistoryself', array('index','view','My Appraisal History')); - - $acl->addResource(new Zend_Acl_Resource('default:disciplinarymyincidents')); - $acl->allow('admin', 'default:disciplinarymyincidents', array('index','view','edit','saveemployeeappeal','getdisciplinaryincidentpdf')); - - $acl->addResource(new Zend_Acl_Resource('default:disciplinaryteamincidents')); - $acl->allow('admin', 'default:disciplinaryteamincidents', array('index','view')); - - $acl->addResource(new Zend_Acl_Resource('default:disciplinaryallincidents')); - $acl->allow('admin', 'default:disciplinaryallincidents', array('index','view')); - - $acl->addResource(new Zend_Acl_Resource('default:disciplinaryviolation')); - $acl->allow('admin', 'default:disciplinaryviolation', array('index','add','view','edit','delete','addpopup')); - } if($role == 2 ) { @@ -2301,4 +2277,4 @@ protected function _getAcl() } } -?> \ No newline at end of file +?>