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 05f8bbb26..1e95b6e04 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -29,10 +29,16 @@
- criteriasLength; $i++) {?> + criteriasLength; $i++) { + // modRowMap holds the number of modifier rows for each criteria element + // i.e. if we have 'Album contains 1' and 'Album contains 2' the modRowMap + // for Album is 2 + ?> modRowMap[$i]; $j++) { + // determine if logic label should be 'and' or 'or' if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = 'or'; else $logicLabel = 'and'; + $disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false; // determine if the next row is disabled and only display the logic label if it isn't if ($j == $this->modRowMap[$i]-1 && $i < 25) {