From 4abe301fbbf350185546c9f4fab9646bcf05aac2 Mon Sep 17 00:00:00 2001 From: Robbt Date: Tue, 11 Dec 2018 21:34:06 -0500 Subject: [PATCH] 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"));