From b9d82a579f21abf8ebec295781807624e4e3db27 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 16 Apr 2012 18:16:24 +0200
Subject: [PATCH 1/4] CC-3407 : Timeline: Display if tracks are missing on disk

---
 airtime_mvc/application/models/ShowBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php
index 9d320aec8..1d1b05817 100644
--- a/airtime_mvc/application/models/ShowBuilder.php
+++ b/airtime_mvc/application/models/ShowBuilder.php
@@ -208,7 +208,7 @@ class Application_Model_ShowBuilder {
             $this->getScheduledStatus($startsEpoch, min($endsEpoch, $showEndEpoch), $row);
 
             $row["id"] = intval($p_item["sched_id"]);
-            $row["image"] = $p_item["file_exists"] ? true : false;
+            $row["image"] = $p_item["file_exists"] == "t" ? true : false;
             $row["instance"] = intval($p_item["si_id"]);
             $row["starts"] = $schedStartDT->format("H:i:s");
             $row["ends"] = $schedEndDT->format("H:i:s");

From 7e3112e3d7fbe3e33701e9c12c8df4581b5c55c6 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 16 Apr 2012 18:31:15 +0200
Subject: [PATCH 2/4] CC-3610 : Now Playing ->songs in the Now Playing do not
 reflect the changes affected changed END_OF_SHOW

---
 airtime_mvc/application/models/Show.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index a8297017f..9e3c5b8d2 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1133,7 +1133,7 @@ class Application_Model_Show {
             try {
                 //update the status flag in cc_schedule.
                 $instances = CcShowInstancesQuery::create()
-                    ->filterByDbStarts($current_timestamp, Criteria::GREATER_EQUAL)
+                    ->filterByDbEnds($current_timestamp, Criteria::GREATER_THAN)
                     ->filterByDbShowId($data['add_show_id'])
                     ->find($con);
 

From df3acb559001cbdd66bd8786af51aa1b8dbe77f7 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 16 Apr 2012 14:57:53 -0400
Subject: [PATCH 3/4] CC-3654: Cannot resize current (non-repeating) show on
 the calendar

- fixed
---
 airtime_mvc/application/models/Show.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index a8297017f..7eab4e841 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -176,7 +176,7 @@ class Application_Model_Show {
 
         //update all cc_show_instances that are in the future.
         $sql = "UPDATE cc_show_instances SET ends = (ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}')
-                WHERE (show_id = {$this->_showId} AND starts > '$current_timestamp')
+                WHERE (show_id = {$this->_showId} AND ends > '$current_timestamp')
                 AND ((ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}' - starts) <= interval '24:00');";
 
         //update cc_show_days so future shows can be created with the new duration.
@@ -1618,7 +1618,7 @@ class Application_Model_Show {
                 $options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]);
             }
 
-            if ($p_editable && (strtotime($today_timestamp) < strtotime($show["starts"]))) {
+            if ($p_editable && (strtotime($today_timestamp) < strtotime($show["ends"]))) {
                 $options["editable"] = true;
             }
 

From 90edd9d1b08e3629448d091ef5be2d1aa1ef83c9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 16 Apr 2012 15:10:01 -0400
Subject: [PATCH 4/4] CC-3643: System->Streams - Master URL GUI is broken after
 overriding URL setting

- fixed
---
 airtime_mvc/public/js/airtime/preferences/streamsetting.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 422bb4a9f..3c05bd8e5 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -116,9 +116,9 @@ function setLiveSourceConnectionOverrideListener(){
     
     // set action for "OK" and "X"
     var live_dj_input = $("#live_dj_connection_url_tb")
-    var live_dj_label = live_dj_input.parent().find("span")
+    var live_dj_label = live_dj_input.parent().find("#stream_url")
     var master_dj_input = $("#master_dj_connection_url_tb")
-    var master_dj_label = master_dj_input.parent().find("span")
+    var master_dj_label = master_dj_input.parent().find("#stream_url")
     
     live_dj_input.find("#ok").click(function(event){
     	event.preventDefault()