From 54ab58a9c7524cd0d92c841339a230afe4b852af Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 18 Sep 2012 16:49:45 -0400
Subject: [PATCH 1/3] CC-4465: Calendar: Remove warning icon on empty shows if
 show is in the past

-removed (commented out) code for this ticket
-postponing for now
---
 .../public/js/airtime/schedule/full-calendar-functions.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 5e95a31c8..d31e34476 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -255,8 +255,8 @@ function eventRender(event, element, view) {
     }
     
     //add scheduled show content empty icon
-    addIcon = checkEmptyShowStatus(event);
-    if (!addIcon) {
+    //addIcon = checkEmptyShowStatus(event);
+    //if (!addIcon) {
         if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
             if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
                 if (event.soundcloud_id === -1) {
@@ -282,7 +282,7 @@ function eventRender(event, element, view) {
                 }
             }
         }
-    }
+    //}
 
     //rebroadcast icon
     if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
@@ -518,6 +518,7 @@ function addQtipToSCIcons(ele){
  *    This gets checked when we are deciding if the show-empty icon should be added
  *    at the beginning of an event render callback.
  */
+/*
 function checkEmptyShowStatus(e) {
     var currDate = new Date();
     var endTime;
@@ -541,6 +542,7 @@ function checkEmptyShowStatus(e) {
         return showOver;
     }
 }
+*/
 
 //Alert the error and reload the page
 //this function is used to resolve concurrency issue

From 8433ec5445d8af9235735a29d58c5e53daaf8b8d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 18 Sep 2012 16:50:42 -0400
Subject: [PATCH 2/3] CC-4482: Smart Blocks -> tracks with empty "Album" name
 are NOT filtered in

- fixed
---
 airtime_mvc/application/models/Block.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 0c349d9f4..fa305a90a 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1291,6 +1291,10 @@ SQL;
                         } else {
                             $qry->add($spCriteria, $spCriteriaValue, $spCriteriaModifier);
                         }
+                        
+                        if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) {
+                            $qry->addOr($spCriteria, null, Criteria::ISNULL);
+                        }
                     } catch (Exception $e) {
                         Logging::info($e);
                     }

From b77429164bb2aaa4e46b374e0682ef3d9b67c677 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 18 Sep 2012 16:55:46 -0400
Subject: [PATCH 3/3] CC-4465: Calendar: Remove warning icon on empty shows if
 show is in the past

-removed setInterval function
---
 .../public/js/airtime/schedule/full-calendar-functions.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index d31e34476..7ecd6d15d 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -554,7 +554,7 @@ function alertShowErrorAndReload(){
 $(document).ready(function(){
     setInterval( "checkSCUploadStatus()", 5000 );
     setInterval( "getCurrentShow()", 5000 );
-    setInterval( "checkEmptyShowStatus()", 5000 );
+    //setInterval( "checkEmptyShowStatus()", 5000 );
 });
 
 var view_name;