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

CC-2123: Rebroadcast: Show status of upload in the calendar and show content

Browse source 
-Changes for full calendar implemented
This commit is contained in:
martin 2011-04-02 13:30:04 -04:00
parent d664108a47
commit 8cc161ce71
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/models/Shows.php
View file

@ -271,7 +271,7 @@ class Show {
{
global $CC_DBC;
$sql = "SELECT starts, ends, record, rebroadcast, instance_id, show_id, name, description,
$sql = "SELECT starts, ends, record, rebroadcast, soundcloud_id, instance_id, show_id, name, description,
color, background_color, cc_show_instances.id AS instance_id
FROM cc_show_instances
LEFT JOIN cc_show ON cc_show.id = cc_show_instances.show_id";
@ -562,6 +562,7 @@ class Show {
$event["showId"] = $show["show_id"];
$event["record"] = intval($show["record"]);
$event["rebroadcast"] = intval($show["rebroadcast"]);
$event["soundcloud_id"] = (is_null($show["soundcloud_id"]) ? -1 : $show["soundcloud_id"]);
foreach($options as $key=>$value) {
$event[$key] = $value;
@ -1010,6 +1011,7 @@ class Show_DAL {
$sql = "SELECT"
." si.starts as show_starts,"
." si.ends as show_ends,"
." si.rebroadcast as rebroadcast,"
." st.starts as item_starts,"
." st.ends as item_ends,"
." st.clip_length as clip_length,"