From 1b48f91dbdd707e69d7cd2da50a47bf26bb32e4d Mon Sep 17 00:00:00 2001 From: Robbt Date: Tue, 11 Dec 2018 21:14:35 -0500 Subject: [PATCH 1/6] work in progress --- airtime_mvc/application/forms/SmartBlockCriteria.php | 11 ++++++----- .../application/models/airtime/om/BaseCcBlock.php | 6 +++--- airtime_mvc/build/sql/schema.sql | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index cf9764b1d..18c1ca53f 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -223,7 +223,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { // load type $out = CcBlockQuery::create()->findPk($p_blockId); - if ($out->getDbType() == "static") { + if ($out->getDbType() == "dynamic") { $blockType = 0; } else { $blockType = 1; @@ -233,8 +233,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $spType->setLabel(_('Type:')) ->setDecorators(array('viewHelper')) ->setMultiOptions(array( - 'static' => _('Static'), - 'dynamic' => _('Dynamic') + 'dynamic' => _('Dynamic'), + 'static' => _('Static') + )) ->setValue($blockType); $this->addElement($spType); @@ -491,10 +492,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $generate->setAttrib('title', _('Generate playlist content and save criteria')); $generate->setIgnore(true); if ($blockType == 0) { - $generate->setLabel(_('Generate')); + $generate->setLabel(_('Preview')); } else { - $generate->setLabel(_('Preview')); + $generate->setLabel(_('Generate')); } $generate->setDecorators(array('viewHelper')); $this->addElement($generate); diff --git a/airtime_mvc/application/models/airtime/om/BaseCcBlock.php b/airtime_mvc/application/models/airtime/om/BaseCcBlock.php index 236d3542d..f5d0ad630 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcBlock.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcBlock.php @@ -75,7 +75,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent /** * The value for the type field. - * Note: this column has a database default value of: 'static' + * Note: this column has a database default value of: 'dynamic' * @var string */ protected $type; @@ -151,7 +151,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent { $this->name = ''; $this->length = '00:00:00'; - $this->type = 'static'; + $this->type = 'dynamic'; } /** @@ -494,7 +494,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent return false; } - if ($this->type !== 'static') { + if ($this->type !== 'dynamic') { return false; } diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index cc7ac52d4..aae02129e 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -299,7 +299,7 @@ CREATE TABLE "cc_block" "creator_id" INTEGER, "description" VARCHAR(512), "length" interval DEFAULT '00:00:00', - "type" VARCHAR(7) DEFAULT 'static', + "type" VARCHAR(7) DEFAULT 'dynamic', PRIMARY KEY ("id") ); From c7767c8a8da797c2f402a279723c4e277ec5a128 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 12 Dec 2018 02:23:25 +0000 Subject: [PATCH 2/6] avoid fail when blocks are created as dynamic by default --- airtime_mvc/application/models/Block.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index bf61b21a5..ae65c3f9b 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -361,10 +361,12 @@ SQL; { $result = CcBlockcriteriaQuery::create()->filterByDbBlockId($this->id) ->filterByDbCriteria('limit')->findOne(); - $modifier = $result->getDbModifier(); - $value = $result->getDbValue(); + if ($result) { + $modifier = $result->getDbModifier(); + $value = $result->getDbValue(); + return array($value, $modifier); + } - return array($value, $modifier); } // this function returns sum of all track length under this block. From 4abe301fbbf350185546c9f4fab9646bcf05aac2 Mon Sep 17 00:00:00 2001 From: Robbt Date: Tue, 11 Dec 2018 21:34:06 -0500 Subject: [PATCH 3/6] modified javascript and binary values to make dynamic default --- airtime_mvc/application/models/Block.php | 2 +- airtime_mvc/public/js/airtime/library/library.js | 2 +- airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index ae65c3f9b..fb94ee7a7 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1160,7 +1160,7 @@ SQL; { $data = $this->organizeSmartPlaylistCriteria($p_criteria); // saving dynamic/static flag - $blockType = $data['etc']['sp_type'] == 0 ? 'static':'dynamic'; + $blockType = $data['etc']['sp_type'] == 0 ? 'dynamic':'static'; $this->saveType($blockType); $this->storeCriteriaIntoDb($data); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index c54fee9f7..351c71e57 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1277,7 +1277,7 @@ var AIRTIME = (function(AIRTIME) { } // remove 'Add to smart block' option if the current // block is dynamic - if ($('input:radio[name=sp_type]:checked').val() === "1") { + if ($('input:radio[name=sp_type]:checked').val() === "0") { delete oItems.pl_add; } items = oItems; diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index 99fa5ff18..2c650583b 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -473,7 +473,7 @@ function setupUI() { } if (activeTab.find('.obj_type').val() == 'block') { - if (playlist_type == "0") { + if (playlist_type == "1") { shuffleButton.removeAttr("disabled"); generateButton.removeAttr("disabled"); generateButton.html($.i18n._("Generate")); From af441d4db4ce78f8a9a36f99aec5edb970ffeb03 Mon Sep 17 00:00:00 2001 From: Robbt Date: Tue, 11 Dec 2018 21:40:09 -0500 Subject: [PATCH 4/6] added schema change to database controller --- .../downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql | 1 + .../controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql create mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql new file mode 100644 index 000000000..6afbf815b --- /dev/null +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql @@ -0,0 +1 @@ +ALTER TABLE cc_block ALTER COLUMN 'type' SET DEFAULT 'static'; \ No newline at end of file diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql new file mode 100644 index 000000000..d6bb746c9 --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql @@ -0,0 +1 @@ +ALTER TABLE cc_block ALTER COLUMN 'type' SET DEFAULT 'dynamic'; From 1bf5fcc16908b290cccb42969c4ddedf503fc571 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 12 Dec 2018 09:44:52 -0500 Subject: [PATCH 5/6] removed quote around column name --- .../downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql | 2 +- .../controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql index 6afbf815b..1f562169c 100644 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql @@ -1 +1 @@ -ALTER TABLE cc_block ALTER COLUMN 'type' SET DEFAULT 'static'; \ No newline at end of file +ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'static'; diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql index d6bb746c9..08b362d0e 100644 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql @@ -1 +1 @@ -ALTER TABLE cc_block ALTER COLUMN 'type' SET DEFAULT 'dynamic'; +ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'dynamic'; From 9562470d47bfb3185e36bb0326ebd45b65d78387 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 12 Dec 2018 12:21:42 -0500 Subject: [PATCH 6/6] added upgraded class --- airtime_mvc/application/upgrade/Upgrades.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index e305ca228..b524431ae 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -532,3 +532,17 @@ class AirtimeUpgrader300alpha6 extends AirtimeUpgrader return '3.0.0-alpha.6'; } } + +class AirtimeUpgrader300alpha7 extends AirtimeUpgrader +{ + protected function getSupportedSchemaVersions() { + return array( + '3.0.0-alpha.6' + ); + } + + public function getNewVersion() { + return '3.0.0-alpha.7'; + } +} +