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

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

This commit is contained in:
Rudi Grinberg 2012-09-10 16:30:38 -04:00
parent fdc7245a15 fba0e18620
commit 43bef4939e
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -339,7 +339,7 @@ class ScheduleController extends Zend_Controller_Action
return false;
}
if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER) && $user->isHostOfShow($show->getShowId())))
if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)) || $user->isHostOfShow($show->getShowId()))
$show->clearShow();
}
@ -404,7 +404,7 @@ class ScheduleController extends Zend_Controller_Action
return false;
}
if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER) && $user->isHostOfShow($show->getShowId()))) {
if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)) || $user->isHostOfShow($show->getShowId())) {
$show->removeGroupFromShow($group_id);
}

3
airtime_mvc/application/models/Datatables.php
View File

@ -13,6 +13,9 @@ class Application_Model_Datatables
if ($dbname == 'utime' || $dbname == 'mtime') {
$input1 = isset($info[0])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[0]):null;
$input2 = isset($info[1])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[1]):null;
} else if($dbname == 'bit_rate') {
$input1 = isset($info[0])?intval($info[0]) * 1000:null;
$input2 = isset($info[1])?intval($info[1]) * 1000:null;
} else {
$input1 = isset($info[0])?$info[0]:null;
$input2 = isset($info[1])?$info[1]:null;

2
airtime_mvc/public/js/airtime/library/library.js
View File

@ -416,7 +416,7 @@ var AIRTIME = (function(AIRTIME) {
/* Language */ { "sTitle" : "Language" , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } ,
/* Owner */ { "sTitle" : "Owner" , "mDataProp" : "owner" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } ,
/* Conductor */ { "sTitle" : "Conductor" , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" },
/* Replay Gain */ { "sTitle" : "Replay Gain" , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" }
/* Replay Gain */ { "sTitle" : "Replay Gain" , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "80px" }
],
"bProcessing": true,

8
install_full/ubuntu/airtime-full-install
View File

@ -64,15 +64,15 @@ apt-get -y --force-yes install libmp3lame-dev lame icecast2
#Ubuntu Lucid has both zendframework and zend-framework. Difference appears to be that zendframework is for
#1.10 and zend-framework is 1.11
if [ "$dist" = "Debian" ]; then
apt-get -y install zendframework
apt-get -y --force-yes install zendframework
else
apt-get -y install libzend-framework-php
apt-get -y --force-yes install libzend-framework-php
fi
if [ "$code" = "lucid" ]; then
apt-get -y install timeout
apt-get -y --force-yes install timeout
else
apt-get -y install coreutils
apt-get -y --force-yes install coreutils
fi

10
install_full/ubuntu/airtime-full-install-nginx
View File

@ -38,7 +38,7 @@ fi
apt-get update
# Updated package list
apt-get -y install tar gzip curl nginx php5-pgsql php5-fpm \
apt-get -y --force-yes install tar gzip curl nginx php5-pgsql php5-fpm \
php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \
libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
@ -54,15 +54,15 @@ apt-get -y --force-yes install libmp3lame-dev lame icecast2
#Ubuntu Lucid has both zendframework and zend-framework. Difference appears to be that zendframework is for
#1.10 and zend-framework is 1.11
if [ "$dist" = "Debian" ]; then
apt-get -y install zendframework
apt-get -y install --force-yes zendframework
else
apt-get -y install libzend-framework-php
apt-get -y install --force-yes libzend-framework-php
fi
if [ "$code" = "lucid" ]; then
apt-get -y install timeout
apt-get -y install --force-yes timeout
else
apt-get -y install coreutils
apt-get -y install --force-yes coreutils
fi
# NGINX Config File