Updated Show services to account for added show instance description field

This commit is contained in:
Duncan Sommerville 2014-09-19 13:02:38 -04:00
parent 2630d88a03
commit 0789de9392
2 changed files with 16 additions and 4 deletions

View File

@ -92,6 +92,7 @@ class Application_Service_ShowFormService
* when the user edits a repeating instance * when the user edits a repeating instance
*/ */
$forms["what"]->makeReadonly(); $forms["what"]->makeReadonly();
$forms["what"]->enableInstanceDesc();
$forms["repeats"]->disable(); $forms["repeats"]->disable();
$forms["who"]->disable(); $forms["who"]->disable();
$forms["style"]->disable(); $forms["style"]->disable();
@ -124,14 +125,17 @@ class Application_Service_ShowFormService
private function populateFormWhat($form) private function populateFormWhat($form)
{ {
$form->populate( $ccShowInstance = CcShowInstancesQuery::create()->findPk($this->instanceId);
$form->populate(
array( array(
'add_show_instance_id' => $this->instanceId, 'add_show_instance_id' => $this->instanceId,
'add_show_id' => $this->ccShow->getDbId(), 'add_show_id' => $this->ccShow->getDbId(),
'add_show_name' => $this->ccShow->getDbName(), 'add_show_name' => $this->ccShow->getDbName(),
'add_show_url' => $this->ccShow->getDbUrl(), 'add_show_url' => $this->ccShow->getDbUrl(),
'add_show_genre' => $this->ccShow->getDbGenre(), 'add_show_genre' => $this->ccShow->getDbGenre(),
'add_show_description' => $this->ccShow->getDbDescription())); 'add_show_description' => $this->ccShow->getDbDescription(),
'add_show_instance_description' => $ccShowInstance->getDbDescription()));
} }
private function populateFormWhen($form) private function populateFormWhen($form)
@ -292,7 +296,7 @@ class Application_Service_ShowFormService
array( array(
'add_show_background_color' => $this->ccShow->getDbBackgroundColor(), 'add_show_background_color' => $this->ccShow->getDbBackgroundColor(),
'add_show_color' => $this->ccShow->getDbColor(), 'add_show_color' => $this->ccShow->getDbColor(),
'show_logo_current' => $src)); 'add_show_logo_current' => $src));
} }
/** /**

View File

@ -141,9 +141,17 @@ class Application_Service_ShowService
$ccShowInstance->updateDbTimeFilled($con); $ccShowInstance->updateDbTimeFilled($con);
$ccShowInstance->updateScheduleStatus($con); $ccShowInstance->updateScheduleStatus($con);
$ccShowInstance
->setDbDescription($showData['add_show_instance_description'])
->save();
//delete the edited instance from the repeating sequence //delete the edited instance from the repeating sequence
$ccShowInstanceOrig->setDbModifiedInstance(true)->save(); $ccShowInstanceOrig
->setDbModifiedInstance(true)
->setDbDescription($showData['add_show_instance_description'])
->save();
$con->commit(); $con->commit();
Application_Model_RabbitMq::PushSchedule(); Application_Model_RabbitMq::PushSchedule();