Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas

This commit is contained in:
drigato 2015-04-15 10:50:57 -04:00
parent 1c2a307d34 3695049a6c
commit d5a29398c6
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/forms/helpers/CustomDecorators.php
View File

@ -12,4 +12,18 @@ class Airtime_Decorator_SuperAdmin_Only extends Zend_Form_Decorator_Abstract
return "";
}
}
}
/** Hide a Zend_Form_Element unless you're logged in as an Admin or SuperAdmin. */
class Airtime_Decorator_Admin_Only extends Zend_Form_Decorator_Abstract
{
public function render($content)
{
$currentUser = Application_Model_User::getCurrentUser();
if ($currentUser->isSuperAdmin() || $currentUser->isAdmin()) {
return $content;
} else {
return "";
}
}
}

2
airtime_mvc/public/css/styles.css
View File

@ -484,7 +484,7 @@ fieldset.plain {
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
}
input[readonly]{
input[readonly], textarea[readonly] {
background-color:#b1b1b1
}

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

@ -468,9 +468,11 @@ var AIRTIME = (function(AIRTIME){
}
a = oData.ColReorder;
for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") {
a[i] = parseInt(a[i], 10);
if (a) {
for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") {
a[i] = parseInt(a[i], 10);
}
}
}