diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 114cfd919..91d1cb6c2 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -92,19 +92,24 @@
0) && */ $disabled) { echo 'style=display:none'; } ?> > - element->getElement("sp_criteria_field_".$i."_".$j) ?> - element->getElement("sp_criteria_modifier_".$i."_".$j) /* @todo finish this */?> + element->getElement("sp_criteria_field_".$i."_".$j) ?> + element->getElement("sp_criteria_modifier_".$i."_".$j); Logging::info($this->element->getElement('sp_criteria_modifier_'.$i.'_'.$j)->getValue());?> element->getElement("sp_criteria_value_".$i."_".$j) ?> - element->getElement("sp_criteria_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?> + element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue()) == 1) + ) {echo('style="display:none;"'); }?>> + element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?> element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_extra_'.$i."_".$j) ?> - element->getElement("sp_criteria_extra_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?> - + element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue() == 'between')) { echo 'style="display:none;"'; }?>>element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?> diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index 5442de35c..c70abbef9 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -529,7 +529,6 @@ function setupUI() { * and shows the criteria drop-down */ function enableAndShowDateTimeDropdown(valEle, index) { - console.log('datetime show'); var spanDatetime = valEle.nextAll("#datetime_select"); spanDatetime.children('#sp_criteria_datetime_select_'+index).removeAttr("disabled"); spanDatetime.children('#sp_criteria_extra_datetime_select_'+index).removeAttr("disabled");