From 8bd3a357898c9867554562a4f514985d871f1dcf Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 19 Apr 2012 11:24:30 -0400
Subject: [PATCH 1/2] CC-3683: Upgraded database not equivalent to fresh
install database part 1
- fixed
---
.../models/airtime/map/CcShowTableMap.php | 4 ++--
.../application/models/airtime/om/BaseCcShow.php | 16 ++++++++++++++--
airtime_mvc/build/schema.xml | 4 ++--
airtime_mvc/build/sql/schema.sql | 4 ++--
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php
index f0d7c84c3..713de40a9 100644
--- a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php
+++ b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php
@@ -45,8 +45,8 @@ class CcShowTableMap extends TableMap {
$this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null);
$this->addColumn('COLOR', 'DbColor', 'VARCHAR', false, 6, null);
$this->addColumn('BACKGROUND_COLOR', 'DbBackgroundColor', 'VARCHAR', false, 6, null);
- $this->addColumn('LIVE_STREAM_USING_AIRTIME_AUTH', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, null);
- $this->addColumn('LIVE_STREAM_USING_CUSTOM_AUTH', 'DbLiveStreamUsingCustomAuth', 'BOOLEAN', false, null, null);
+ $this->addColumn('LIVE_STREAM_USING_AIRTIME_AUTH', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, false);
+ $this->addColumn('LIVE_STREAM_USING_CUSTOM_AUTH', 'DbLiveStreamUsingCustomAuth', 'BOOLEAN', false, null, false);
$this->addColumn('LIVE_STREAM_USER', 'DbLiveStreamUser', 'VARCHAR', false, 255, null);
$this->addColumn('LIVE_STREAM_PASS', 'DbLiveStreamPass', 'VARCHAR', false, 255, null);
// validators
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShow.php b/airtime_mvc/application/models/airtime/om/BaseCcShow.php
index 78722b5ba..35f9798bb 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcShow.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcShow.php
@@ -71,12 +71,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent
/**
* The value for the live_stream_using_airtime_auth field.
+ * Note: this column has a database default value of: false
* @var boolean
*/
protected $live_stream_using_airtime_auth;
/**
* The value for the live_stream_using_custom_auth field.
+ * Note: this column has a database default value of: false
* @var boolean
*/
protected $live_stream_using_custom_auth;
@@ -138,6 +140,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent
$this->name = '';
$this->url = '';
$this->genre = '';
+ $this->live_stream_using_airtime_auth = false;
+ $this->live_stream_using_custom_auth = false;
}
/**
@@ -412,7 +416,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent
$v = (boolean) $v;
}
- if ($this->live_stream_using_airtime_auth !== $v) {
+ if ($this->live_stream_using_airtime_auth !== $v || $this->isNew()) {
$this->live_stream_using_airtime_auth = $v;
$this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH;
}
@@ -432,7 +436,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent
$v = (boolean) $v;
}
- if ($this->live_stream_using_custom_auth !== $v) {
+ if ($this->live_stream_using_custom_auth !== $v || $this->isNew()) {
$this->live_stream_using_custom_auth = $v;
$this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH;
}
@@ -502,6 +506,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent
return false;
}
+ if ($this->live_stream_using_airtime_auth !== false) {
+ return false;
+ }
+
+ if ($this->live_stream_using_custom_auth !== false) {
+ return false;
+ }
+
// otherwise, everything was equal, so return TRUE
return true;
} // hasOnlyDefaultValues()
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 16494c300..d60020de1 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -146,8 +146,8 @@
<column name="description" phpName="DbDescription" type="VARCHAR" size="512" required="false"/>
<column name="color" phpName="DbColor" type="VARCHAR" size="6" required="false"/>
<column name="background_color" phpName="DbBackgroundColor" type="VARCHAR" size="6" required="false"/>
- <column name="live_stream_using_airtime_auth" phpName="DbLiveStreamUsingAirtimeAuth" type="BOOLEAN" required="false"/>
- <column name="live_stream_using_custom_auth" phpName="DbLiveStreamUsingCustomAuth" type="BOOLEAN" required="false"/>
+ <column name="live_stream_using_airtime_auth" phpName="DbLiveStreamUsingAirtimeAuth" type="BOOLEAN" required="false" defaultValue="false"/>
+ <column name="live_stream_using_custom_auth" phpName="DbLiveStreamUsingCustomAuth" type="BOOLEAN" required="false" defaultValue="false"/>
<column name="live_stream_user" phpName="DbLiveStreamUser" type="VARCHAR" size="255" required="false"/>
<column name="live_stream_pass" phpName="DbLiveStreamPass" type="VARCHAR" size="255" required="false"/>
</table>
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index da3029ff6..62b865c1e 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -178,8 +178,8 @@ CREATE TABLE "cc_show"
"description" VARCHAR(512),
"color" VARCHAR(6),
"background_color" VARCHAR(6),
- "live_stream_using_airtime_auth" BOOLEAN,
- "live_stream_using_custom_auth" BOOLEAN,
+ "live_stream_using_airtime_auth" BOOLEAN default 'f',
+ "live_stream_using_custom_auth" BOOLEAN default 'f',
"live_stream_user" VARCHAR(255),
"live_stream_pass" VARCHAR(255),
PRIMARY KEY ("id")
From a7fc31012fdcf476f55740728460544825b8498c Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 19 Apr 2012 11:29:19 -0400
Subject: [PATCH 2/2] CC-3689: Remove Edit Show Instance ability
- done
---
.../application/controllers/ScheduleController.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 4b5a92320..ff9b73a8b 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -263,9 +263,10 @@ class ScheduleController extends Zend_Controller_Action
}
} else {
if($instance->isRepeating()){
- $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array());
+ /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array());
$menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form");
- $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");
+ $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/
+ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form");
}else{
if($instance->isRebroadcast()){
$menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form");
@@ -284,9 +285,10 @@ class ScheduleController extends Zend_Controller_Action
if ($isAdminOrPM || $isDJ) {
if($instance->isRepeating()){
- $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array());
+ /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array());
$menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form");
- $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");
+ $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/
+ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form");
}else{
if($instance->isRebroadcast()){
$menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form");
@@ -726,7 +728,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->edit = true;
}
- public function editShowInstanceAction(){
+ /*public function editShowInstanceAction(){
$js = $this->_getParam('data');
$data = array();
@@ -743,7 +745,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->addNewShow = false;
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
}
- }
+ }*/
public function editShowAction(){