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

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

This commit is contained in:
Martin Konecny 2012-04-16 15:11:47 -04:00
parent 5bc720fd4c 90edd9d1b0
commit 4a206b19e6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Show.php
View File

@ -176,7 +176,7 @@ class Application_Model_Show {
//update all cc_show_instances that are in the future. //update all cc_show_instances that are in the future.
$sql = "UPDATE cc_show_instances SET ends = (ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}') $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');"; 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. //update cc_show_days so future shows can be created with the new duration.
@ -1133,7 +1133,7 @@ class Application_Model_Show {
try { try {
//update the status flag in cc_schedule. //update the status flag in cc_schedule.
$instances = CcShowInstancesQuery::create() $instances = CcShowInstancesQuery::create()
->filterByDbStarts($current_timestamp, Criteria::GREATER_EQUAL) ->filterByDbEnds($current_timestamp, Criteria::GREATER_THAN)
->filterByDbShowId($data['add_show_id']) ->filterByDbShowId($data['add_show_id'])
->find($con); ->find($con);
@ -1618,7 +1618,7 @@ class Application_Model_Show {
$options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]); $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; $options["editable"] = true;
} }

2
airtime_mvc/application/models/ShowBuilder.php
View File

@ -208,7 +208,7 @@ class Application_Model_ShowBuilder {
$this->getScheduledStatus($startsEpoch, min($endsEpoch, $showEndEpoch), $row); $this->getScheduledStatus($startsEpoch, min($endsEpoch, $showEndEpoch), $row);
$row["id"] = intval($p_item["sched_id"]); $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["instance"] = intval($p_item["si_id"]);
$row["starts"] = $schedStartDT->format("H:i:s"); $row["starts"] = $schedStartDT->format("H:i:s");
$row["ends"] = $schedEndDT->format("H:i:s"); $row["ends"] = $schedEndDT->format("H:i:s");

4
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -116,9 +116,9 @@ function setLiveSourceConnectionOverrideListener(){
// set action for "OK" and "X" // set action for "OK" and "X"
var live_dj_input = $("#live_dj_connection_url_tb") 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_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){ live_dj_input.find("#ok").click(function(event){
event.preventDefault() event.preventDefault()