From 5ac6877e6002de44ae4bdbc1eae76e29df9fe6ab Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 12 Sep 2012 16:29:26 -0400
Subject: [PATCH 1/2] CC-4362: Smart Block: error for multiple criteria

-fixed
---
 .../js/airtime/playlist/smart_blockbuilder.js      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index 503e243a8..0e591e117 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -204,6 +204,20 @@ function setSmartBlockEvents() {
     /********** CRITERIA CHANGE **********/
     form.find('select[id^="sp_criteria"]:not([id^="sp_criteria_modifier"])').live("change", function(){
         var index = getRowIndex($(this).parent());
+        //need to change the criteria value for any modifier rows
+        var critVal = $(this).val();
+        var divs = $(this).parent().nextAll(':visible');
+        $.each(divs, function(i, div){
+            var critSelect = $(div).children('select[id^="sp_criteria_field"]');
+            if (critSelect.hasClass('sp-invisible')) {
+                critSelect.val(critVal);
+            /* If the select box is visible we know the modifier rows
+             * have ended
+             */
+            } else {
+                return false;
+            }
+        });
         
         // disable extra field and hide the span
         disableAndHideExtraField($(this), index);

From 9c8f4fe404ca8c1cf10e02ad6d5d103fd3f52562 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 12 Sep 2012 17:09:00 -0400
Subject: [PATCH 2/2] CC-4414: Unused local variables in forms

-done
---
 airtime_mvc/application/forms/AddShowWhen.php        | 3 ---
 airtime_mvc/application/forms/SmartBlockCriteria.php | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index e9e0157c4..ffad27fea 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -87,9 +87,6 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
     {
         $valid = true;
 
-        $hours;
-        $minutes;
-
         $start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
         $end_time = $formData['add_show_end_date_no_repeat']." ".$formData['add_show_end_time'];
 
diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 8fc9e52ef..8518cc1e9 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -411,8 +411,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         // 3. validate formate according to DB column type
         $multiplier = 1;
         $result = 0;
-        $errors = array();
-        $error = array();
 
         // validation start
         if ($data['etc']['sp_limit_options'] == 'hours') {
@@ -444,8 +442,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             }
         }
 
-        $criteriaFieldsUsed = array();
-
         if (isset($data['criteria'])) {
             foreach ($data['criteria'] as $rowKey=>$row) {
                 foreach ($row as $key=>$d) {