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:
James 2012-04-24 11:26:39 -04:00
parent 2cb17a3b08 8020ae0a29
commit a41f100545
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View File

@ -206,7 +206,6 @@ AIRTIME = (function(AIRTIME) {
} }
}); });
/*
//check if the timeline viewed needs updating. //check if the timeline viewed needs updating.
setInterval(function(){ setInterval(function(){
var data = {}, var data = {},
@ -238,7 +237,7 @@ AIRTIME = (function(AIRTIME) {
} ); } );
}, 5 * 1000); //need refresh in milliseconds }, 5 * 1000); //need refresh in milliseconds
*/
}; };
mod.onResize = function() { mod.onResize = function() {

24
install_minimal/upgrades/airtime-2.1.0/common/Version20120411102907.php
View File

@ -14,18 +14,26 @@ class Version20120411102907 extends AbstractMigration
*/ */
public function up(Schema $schema) public function up(Schema $schema)
{ {
$this->_addSql("ALTER TABLE cc_files ALTER COLUMN length TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_files ALTER COLUMN length TYPE interval");
$this->_addSql("ALTER TABLE cc_files ALTER COLUMN length SET DEFAULT '00:00:00'::interval");
$this->_addSql("ALTER TABLE cc_files ALTER COLUMN file_exists DROP NOT NULL"); $this->_addSql("ALTER TABLE cc_files ALTER COLUMN file_exists DROP NOT NULL");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cuein TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cuein TYPE interval");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cueout TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cuein SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cliplength TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cueout TYPE interval");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cueout SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cliplength TYPE interval");
$this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cliplength SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_in TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_in TYPE interval");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_out TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_in SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN clip_length TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_out TYPE interval");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_out SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN clip_length TYPE interval");
$this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN clip_length SET DEFAULT '00:00:00'");
$this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN time_filled TYPE interval DEFAULT '00:00:00'"); $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN time_filled TYPE interval");
$this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN time_filled set DEFAULT '00:00:00'");
//remove old columns from cc_schedule that deal with groups or playlists. //remove old columns from cc_schedule that deal with groups or playlists.
$this->_addSql("ALTER TABLE cc_schedule DROP COLUMN group_id"); $this->_addSql("ALTER TABLE cc_schedule DROP COLUMN group_id");

2
install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php
View File

@ -15,6 +15,8 @@ class Version20120411174904 extends AbstractMigration
$this->_addSql("ALTER TABLE cc_show_instances ADD created timestamp"); $this->_addSql("ALTER TABLE cc_show_instances ADD created timestamp");
$this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN created SET NOT NULL"); $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN created SET NOT NULL");
$this->_addSql("ALTER TABLE cc_show_instances ADD last_scheduled timestamp");
//setting these to a default now for timeline refresh purposes. //setting these to a default now for timeline refresh purposes.
$now = gmdate("Y-m-d H:i:s"); $now = gmdate("Y-m-d H:i:s");
$this->_addSql("UPDATE cc_show_instances SET created = '$now'"); $this->_addSql("UPDATE cc_show_instances SET created = '$now'");