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

Merge branch 'saas' into saas-cloud-storage-config-per-dev-env

Browse source
This commit is contained in:
drigato 2015-02-05 10:15:48 -05:00
commit e2ff452b8a
8 changed files with 300 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
->add(new Zend_Acl_Resource('upgrade'))
->add(new Zend_Acl_Resource('downgrade'))
->add(new Zend_Acl_Resource('rest:media'))
->add(new Zend_Acl_Resource('rest:show-image'))
->add(new Zend_Acl_Resource('billing'))
->add(new Zend_Acl_Resource('provisioning'));
@ -54,6 +55,7 @@ $ccAcl->allow('G', 'index')
->allow('G', 'provisioning')
->allow('G', 'downgrade')
->allow('G', 'rest:media')
->allow('G', 'rest:show-image')
->allow('H', 'preference', 'is-import-in-progress')
->allow('H', 'usersettings')
->allow('H', 'plupload')