From 0c1c4aa27d85d605b6ca2e6207a59484974da943 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Mon, 10 Sep 2012 15:35:30 -0400
Subject: [PATCH 1/3] Put sql in heredoc for better readability
---
airtime_mvc/application/models/Schedule.php | 27 +++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 76c0ad6af..5abf081ac 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -172,20 +172,21 @@ class Application_Model_Schedule
public static function GetLastScheduleItem($p_timeNow)
{
global $CC_CONFIG;
- $sql = "SELECT"
- ." ft.artist_name, ft.track_title,"
- ." st.starts as starts, st.ends as ends"
- ." FROM $CC_CONFIG[scheduleTable] st"
- ." LEFT JOIN $CC_CONFIG[filesTable] ft"
- ." ON st.file_id = ft.id"
- ." LEFT JOIN $CC_CONFIG[showInstances] sit"
- ." ON st.instance_id = sit.id"
- ." WHERE st.ends < TIMESTAMP :timeNow"
- ." AND st.starts >= sit.starts" //this and the next line are necessary since we can overbook shows.
- ." AND st.starts < sit.ends"
- ." ORDER BY st.ends DESC"
- ." LIMIT 1";
+ $sql = <<<SQL
+SELECT ft.artist_name,
+ ft.track_title,
+ st.starts AS starts,
+ st.ends AS ends
+FROM $CC_CONFIG[scheduleTable] st
+LEFT JOIN $CC_CONFIG[filesTable] ft ON st.file_id = ft.id
+LEFT JOIN $CC_CONFIG[showInstances] sit ON st.instance_id = sit.id
+-- this and the next line are necessary since we can overbook shows.
+WHERE st.ends < TIMESTAMP :timeNow
+ AND st.starts >= sit.starts
+ AND st.starts < sit.ends
+ORDER BY st.ends DESC LIMIT 1;
+SQL;
$row = Application_Common_Database::prepareAndExecute($sql, array(':timeNow'=>$p_timeNow));
return $row;
From 67b295a553fe07fd36c3cc1983adcbb50cc75726 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 10 Sep 2012 15:37:22 -0400
Subject: [PATCH 2/3] CC-4367: Media Library -> Search: Please enable searching
Bit Rate by Kbps
- done
---
airtime_mvc/application/models/Datatables.php | 3 +++
airtime_mvc/public/js/airtime/library/library.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php
index 67586b3b3..a58a1fdb1 100644
--- a/airtime_mvc/application/models/Datatables.php
+++ b/airtime_mvc/application/models/Datatables.php
@@ -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;
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index ba7c0f574..276551d6a 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -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,
From dfb1ffed7907b515497b5593b2c99922d9887cad Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 10 Sep 2012 15:42:05 -0400
Subject: [PATCH 3/3] CC-4319: Calendar: Remove all contents doesn't work
- fixed
---
airtime_mvc/application/controllers/ScheduleController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index f96d8ffb2..0c843786e 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -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);
}