diff --git a/airtime_mvc/application/forms/ShowBuilder.php b/airtime_mvc/application/forms/ShowBuilder.php index f7d61795f..5e7c54ff5 100644 --- a/airtime_mvc/application/forms/ShowBuilder.php +++ b/airtime_mvc/application/forms/ShowBuilder.php @@ -85,7 +85,11 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm private function getShowNames() { - $showNames = array("0" => _("Filter by Show")); + $user = Application_Model_User::getCurrentUser(); + $showNames = array("0" => _("Filter by Show")); + if ($user->getType() === 'H') { + $showNames["-1"] = _("My Shows"); + } $shows = CcShowQuery::create() ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND) diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml index a22bf98f4..69ecfaf97 100644 --- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml +++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml @@ -9,8 +9,8 @@ element->getElement('sb_show_filter') ?> - element->getElement('sb_my_shows')):?> - - element->getElement('sb_my_shows'); ?> - +element->getElement('sb_my_shows')):?> +element->getElement('sb_my_shows')->getLabel(); ?> +element->getElement('sb_my_shows'); ?> + diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index c03cf139f..cf210e415 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -94,8 +94,6 @@ AIRTIME = (function(AIRTIME) { check = validateTimeRange(); - console.log(check); - if (check.isValid) { //reset timestamp value since input values could have changed. AIRTIME.showbuilder.resetTimestamp(); @@ -111,7 +109,8 @@ AIRTIME = (function(AIRTIME) { fn.ops = {}; } fn.ops.showFilter = op.find("#sb_show_filter").val(); - fn.ops.myShows = op.find("#sb_my_shows").is(":checked") ? 1 : 0; + // Hacky? + fn.ops.myShows = (fn.ops.showFilter == -1) ? 1 : 0; } oTable.fnDraw();