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:
denise 2012-04-19 12:35:05 -04:00
parent 64e8640795 a7fc31012f
commit ad769b53d8
5 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -263,9 +263,10 @@ class ScheduleController extends Zend_Controller_Action
} }
} else { } else {
if($instance->isRepeating()){ 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"]["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{ }else{
if($instance->isRebroadcast()){ if($instance->isRebroadcast()){
$menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); $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 ($isAdminOrPM || $isDJ) {
if($instance->isRepeating()){ 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"]["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{ }else{
if($instance->isRebroadcast()){ if($instance->isRebroadcast()){
$menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); $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; $this->view->edit = true;
} }
public function editShowInstanceAction(){ /*public function editShowInstanceAction(){
$js = $this->_getParam('data'); $js = $this->_getParam('data');
$data = array(); $data = array();
@ -743,7 +745,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->addNewShow = false; $this->view->addNewShow = false;
$this->view->form = $this->view->render('schedule/add-show-form.phtml'); $this->view->form = $this->view->render('schedule/add-show-form.phtml');
} }
} }*/
public function editShowAction(){ public function editShowAction(){

4
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
View File

@ -45,8 +45,8 @@ class CcShowTableMap extends TableMap {
$this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null); $this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null);
$this->addColumn('COLOR', 'DbColor', 'VARCHAR', false, 6, null); $this->addColumn('COLOR', 'DbColor', 'VARCHAR', false, 6, null);
$this->addColumn('BACKGROUND_COLOR', 'DbBackgroundColor', '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_AIRTIME_AUTH', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, false);
$this->addColumn('LIVE_STREAM_USING_CUSTOM_AUTH', 'DbLiveStreamUsingCustomAuth', 'BOOLEAN', false, null, null); $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_USER', 'DbLiveStreamUser', 'VARCHAR', false, 255, null);
$this->addColumn('LIVE_STREAM_PASS', 'DbLiveStreamPass', 'VARCHAR', false, 255, null); $this->addColumn('LIVE_STREAM_PASS', 'DbLiveStreamPass', 'VARCHAR', false, 255, null);
// validators // validators

16
airtime_mvc/application/models/airtime/om/BaseCcShow.php
View File

@ -71,12 +71,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent
/** /**
* The value for the live_stream_using_airtime_auth field. * The value for the live_stream_using_airtime_auth field.
* Note: this column has a database default value of: false
* @var boolean * @var boolean
*/ */
protected $live_stream_using_airtime_auth; protected $live_stream_using_airtime_auth;
/** /**
* The value for the live_stream_using_custom_auth field. * The value for the live_stream_using_custom_auth field.
* Note: this column has a database default value of: false
* @var boolean * @var boolean
*/ */
protected $live_stream_using_custom_auth; protected $live_stream_using_custom_auth;
@ -138,6 +140,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent
$this->name = ''; $this->name = '';
$this->url = ''; $this->url = '';
$this->genre = ''; $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; $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->live_stream_using_airtime_auth = $v;
$this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH; $this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH;
} }
@ -432,7 +436,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent
$v = (boolean) $v; $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->live_stream_using_custom_auth = $v;
$this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH; $this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH;
} }
@ -502,6 +506,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent
return false; 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 // otherwise, everything was equal, so return TRUE
return true; return true;
} // hasOnlyDefaultValues() } // hasOnlyDefaultValues()

4
airtime_mvc/build/schema.xml
View File

@ -146,8 +146,8 @@
<column name="description" phpName="DbDescription" type="VARCHAR" size="512" required="false"/> <column name="description" phpName="DbDescription" type="VARCHAR" size="512" required="false"/>
<column name="color" phpName="DbColor" type="VARCHAR" size="6" 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="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_airtime_auth" phpName="DbLiveStreamUsingAirtimeAuth" type="BOOLEAN" required="false" defaultValue="false"/>
<column name="live_stream_using_custom_auth" phpName="DbLiveStreamUsingCustomAuth" type="BOOLEAN" required="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_user" phpName="DbLiveStreamUser" type="VARCHAR" size="255" required="false"/>
<column name="live_stream_pass" phpName="DbLiveStreamPass" type="VARCHAR" size="255" required="false"/> <column name="live_stream_pass" phpName="DbLiveStreamPass" type="VARCHAR" size="255" required="false"/>
</table> </table>

4
airtime_mvc/build/sql/schema.sql
View File

@ -178,8 +178,8 @@ CREATE TABLE "cc_show"
"description" VARCHAR(512), "description" VARCHAR(512),
"color" VARCHAR(6), "color" VARCHAR(6),
"background_color" VARCHAR(6), "background_color" VARCHAR(6),
"live_stream_using_airtime_auth" BOOLEAN, "live_stream_using_airtime_auth" BOOLEAN default 'f',
"live_stream_using_custom_auth" BOOLEAN, "live_stream_using_custom_auth" BOOLEAN default 'f',
"live_stream_user" VARCHAR(255), "live_stream_user" VARCHAR(255),
"live_stream_pass" VARCHAR(255), "live_stream_pass" VARCHAR(255),
PRIMARY KEY ("id") PRIMARY KEY ("id")