Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SAAS-1088 - move 'All My Shows' checkbox to dropdown instead

This commit is contained in:
Duncan Sommerville 2015-09-30 11:38:33 -04:00
parent 258500f650
commit 2ee7e4bf71
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/forms/ShowBuilder.php
View File

@ -85,7 +85,11 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
private function getShowNames() private function getShowNames()
{ {
$user = Application_Model_User::getCurrentUser();
$showNames = array("0" => _("Filter by Show")); $showNames = array("0" => _("Filter by Show"));
if ($user->getType() === 'H') {
$showNames["-1"] = _("My Shows");
}
$shows = CcShowQuery::create() $shows = CcShowQuery::create()
->setFormatter(ModelCriteria::FORMAT_ON_DEMAND) ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)

8
airtime_mvc/application/views/scripts/form/showbuilder.phtml
View File

@ -9,8 +9,8 @@
<?php echo $this->element->getElement('sb_show_filter') ?> <?php echo $this->element->getElement('sb_show_filter') ?>
<?php if ($this->element->getElement('sb_my_shows')):?> <!-- --><?php //if ($this->element->getElement('sb_my_shows')):?>
<label><?php echo $this->element->getElement('sb_my_shows')->getLabel(); ?></label> <!-- <label>--><?php //echo $this->element->getElement('sb_my_shows')->getLabel(); ?><!--</label>-->
<?php echo $this->element->getElement('sb_my_shows'); ?> <!-- --><?php //echo $this->element->getElement('sb_my_shows'); ?>
<?php endif;?> <!-- --><?php //endif;?>
</div> </div>

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

@ -94,8 +94,6 @@ AIRTIME = (function(AIRTIME) {
check = validateTimeRange(); check = validateTimeRange();
console.log(check);
if (check.isValid) { if (check.isValid) {
//reset timestamp value since input values could have changed. //reset timestamp value since input values could have changed.
AIRTIME.showbuilder.resetTimestamp(); AIRTIME.showbuilder.resetTimestamp();
@ -111,7 +109,8 @@ AIRTIME = (function(AIRTIME) {
fn.ops = {}; fn.ops = {};
} }
fn.ops.showFilter = op.find("#sb_show_filter").val(); 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(); oTable.fnDraw();