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

Revert "fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid"

Browse source 
This reverts commit fc4f82a83a.
This commit is contained in:
Robb Ebright 2018-01-07 15:27:58 -05:00
parent 5848d307da
commit 5e7a5b3e1d
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -92,24 +92,19 @@
<div <?php if (/*($i > 0) && */ $disabled) { <div <?php if (/*($i > 0) && */ $disabled) {
echo 'style=display:none'; echo 'style=display:none';
} ?> > } ?> >
<?php <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) /* @todo finish this */?>
<?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j); Logging::info($this->element->getElement('sp_criteria_modifier_'.$i.'_'.$j)->getValue());?>
<?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
<span class='sp_text_font' id="datetime_select" <span class='sp_text_font' id="datetime_select" <?php echo $this->element->getElement("sp_criteria_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
<?php //hide the datetime select unless the relative datetime modifiers are selected
if(!(preg_match('/before|after|between/', $this->element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue()) == 1)
) {echo('style="display:none;"'); }?>>
<?php echo $this->element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
<a class='btn btn-small btn-new' id='modifier_add_<?php echo $i ?>'> <a class='btn btn-small btn-new' id='modifier_add_<?php echo $i ?>'>
<i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?> <i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?>
</a> </a>
<span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span> <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
<span class='sp_text_font' id="extra_datetime_select" <span class='sp_text_font' id="extra_datetime_select" <?php echo $this->element->getElement("sp_criteria_extra_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
<?php if (!($this->element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue() == 'between')) { echo 'style="display:none;"'; }?>><?php echo $this->element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
<a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'> <a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'>
<i class='icon-white icon-remove spl-no-r-margin'></i> <i class='icon-white icon-remove spl-no-r-margin'></i>
</a> </a>

1
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View file

@ -529,6 +529,7 @@ function setupUI() {
* and shows the criteria drop-down * and shows the criteria drop-down
*/ */
function enableAndShowDateTimeDropdown(valEle, index) { function enableAndShowDateTimeDropdown(valEle, index) {
console.log('datetime show');
var spanDatetime = valEle.nextAll("#datetime_select"); var spanDatetime = valEle.nextAll("#datetime_select");
spanDatetime.children('#sp_criteria_datetime_select_'+index).removeAttr("disabled"); spanDatetime.children('#sp_criteria_datetime_select_'+index).removeAttr("disabled");
spanDatetime.children('#sp_criteria_extra_datetime_select_'+index).removeAttr("disabled"); spanDatetime.children('#sp_criteria_extra_datetime_select_'+index).removeAttr("disabled");