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

CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show

This commit is contained in:
Naomi Aro 2012-05-24 18:10:36 +02:00
parent 8b4c876c5b
commit d91850b1ca
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/controllers/ShowbuilderController.php
View File

@ -22,6 +22,10 @@ class ShowbuilderController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$baseUrl = $request->getBaseUrl(); $baseUrl = $request->getBaseUrl();
$user = Application_Model_User::GetCurrentUser();
$userType = $user->getType();
$this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
$data = Application_Model_Preference::GetValue("library_datatable", true); $data = Application_Model_Preference::GetValue("library_datatable", true);
if ($data != "") { if ($data != "") {
@ -61,7 +65,6 @@ class ShowbuilderController extends Zend_Controller_Action
$this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version']),'text/javascript'); $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version']),'text/javascript');
$user = Application_Model_User::GetCurrentUser();
$refer_sses = new Zend_Session_Namespace('referrer'); $refer_sses = new Zend_Session_Namespace('referrer');
if ($request->isPost()) { if ($request->isPost()) {

7
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -103,9 +103,12 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkCancelButton = function() { mod.checkCancelButton = function() {
var $current = $sbTable.find(".sb-current-show.sb-allowed"); var $current = $sbTable.find(".sb-current-show.sb-allowed"),
//this user type should be refactored into a separate users module later
//when there's more time and more JS will need to know user data.
userType = localStorage.getItem('user-type');
if ($current.length !== 0) { if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
AIRTIME.button.enableButton("sb-button-cancel"); AIRTIME.button.enableButton("sb-button-cancel");
} }
else { else {