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

CC-1985 : Automatic rebroadcast of recorded content

Browse source 
working on disabling resizing of a rebroadcast show.
This commit is contained in:
naomiaro 2011-03-15 16:39:52 -04:00
parent 29816f32fa
commit bd81b0cd4f
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/controllers/ScheduleController.php
View file

@ -341,6 +341,7 @@ class ScheduleController extends Zend_Controller_Action
$formRepeats = new Application_Form_AddShowRepeats(); $formRepeats = new Application_Form_AddShowRepeats();
$formStyle = new Application_Form_AddShowStyle(); $formStyle = new Application_Form_AddShowStyle();
$formRecord = new Application_Form_AddShowRR(); $formRecord = new Application_Form_AddShowRR();
$formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates();
$formRebroadcast = new Application_Form_AddShowRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates();
$formWhat->removeDecorator('DtDdWrapper'); $formWhat->removeDecorator('DtDdWrapper');
@ -349,6 +350,7 @@ class ScheduleController extends Zend_Controller_Action
$formRepeats->removeDecorator('DtDdWrapper'); $formRepeats->removeDecorator('DtDdWrapper');
$formStyle->removeDecorator('DtDdWrapper'); $formStyle->removeDecorator('DtDdWrapper');
$formRecord->removeDecorator('DtDdWrapper'); $formRecord->removeDecorator('DtDdWrapper');
$formAbsoluteRebroadcast->removeDecorator('DtDdWrapper');
$formRebroadcast->removeDecorator('DtDdWrapper'); $formRebroadcast->removeDecorator('DtDdWrapper');
$this->view->what = $formWhat; $this->view->what = $formWhat;
@ -357,8 +359,8 @@ class ScheduleController extends Zend_Controller_Action
$this->view->who = $formWho; $this->view->who = $formWho;
$this->view->style = $formStyle; $this->view->style = $formStyle;
$this->view->rr = $formRecord; $this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast; $this->view->rebroadcast = $formRebroadcast;
$what = $formWhat->isValid($data); $what = $formWhat->isValid($data);
$when = $formWhen->isValid($data); $when = $formWhen->isValid($data);
if($when) { if($when) {

27
application/models/Shows.php
View file

@ -457,26 +457,27 @@ class Show {
private static function makeFullCalendarEvent($show, $options=array()) { private static function makeFullCalendarEvent($show, $options=array()) {
global $CC_DBC; global $CC_DBC;
$event = array();
if($show["rebroadcast"]) { if($show["rebroadcast"]) {
$title = "REBROADCAST ".$show["name"]; $title = "REBROADCAST ".$show["name"];
$event["disableResizing"] = true;
} }
else { else {
$title = $show["name"]; $title = $show["name"];
} }
$event = array( $event["id"] = $show["instance_id"];
"id" => $show["instance_id"], $event["title"] = $title;
"title" => $title, $event["start"] = $show["starts"];
"start" => $show["starts"], $event["end"] = $show["ends"];
"end" => $show["ends"], $event["allDay"] = false;
"allDay" => false, $event["description"] = $show["description"];
"description" => $show["description"], $event["color"] = $show["color"];
"color" => $show["color"], $event["backgroundColor"] = $show["background_color"];
"backgroundColor" => $show["background_color"], $event["showId"] = $show["show_id"];
"showId" => $show["show_id"], $event["record"] = intval($show["record"]);
"record" => intval($show["record"]), $event["rebroadcast"] = intval($show["rebroadcast"]);
"rebroadcast" => intval($show["rebroadcast"])
);
foreach($options as $key=>$value) { foreach($options as $key=>$value) {
$event[$key] = $value; $event[$key] = $value;