Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Paul Baranowski 2012-02-23 15:24:40 -05:00
commit e99b23434e
39 changed files with 1608 additions and 1564 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/configs/ACL.php
View file

@ -25,7 +25,8 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
->add(new Zend_Acl_Resource('preference'))
->add(new Zend_Acl_Resource('recorder'))
->add(new Zend_Acl_Resource('showbuilder'))
->add(new Zend_Acl_Resource('auth'));
->add(new Zend_Acl_Resource('auth'))
->add(new Zend_Acl_Resource('usersettings'));
/** Creating permissions */
$ccAcl->allow('G', 'index')
@ -34,11 +35,10 @@ $ccAcl->allow('G', 'index')
->allow('G', 'nowplaying')
->allow('G', 'api')
->allow('G', 'auth')
//->allow('G', 'plupload', array('upload-recorded'))
->allow('G', 'recorder')
->allow('G', 'schedule')
->allow('G', 'dashboard')
//->allow('H', 'plupload', array('plupload', 'upload', 'index'))
->allow('H', 'usersettings')
->allow('H', 'plupload')
->allow('H', 'library')
->allow('H', 'search')