From 46604fdf59ca3d3da3a94fc4584dd05e7e9294e7 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 29 Jun 2012 16:59:03 -0400
Subject: [PATCH] CC-4046: Timeline -> cannot drag and drog song into the
 posion between song's name and "show empty"

-fixed
---
 airtime_mvc/application/models/ShowBuilder.php       | 2 --
 airtime_mvc/public/js/airtime/showbuilder/builder.js | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php
index 07c6d4290..650734e2d 100644
--- a/airtime_mvc/application/models/ShowBuilder.php
+++ b/airtime_mvc/application/models/ShowBuilder.php
@@ -221,7 +221,6 @@ class Application_Model_ShowBuilder {
         $row["title"] = $p_item["show_name"];
         $row["instance"] = intval($p_item["si_id"]);
         $row["image"] = '';
-        $row["id"] = -1;
         
         $this->getScheduledStatus($startsEpoch, $endsEpoch, $row);
 
@@ -311,7 +310,6 @@ class Application_Model_ShowBuilder {
         $row = $this->defaultRowArray;
         $row["footer"] = true;
         $row["instance"] = intval($p_item["si_id"]);
-        $row["id"] = -1;
         $this->getRowTimestamp($p_item, $row);
 
         $showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC"));
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 47881e9fd..c5fea6993 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -589,7 +589,7 @@ var AIRTIME = (function(AIRTIME){
                     $nRow.addClass("sb-future");
                 }
                 
-                if (aData.allowed !== true || aData.header === true) {
+                if (aData.allowed !== true) {
                     $nRow.addClass("sb-not-allowed");
                 }
                 else {
@@ -902,7 +902,7 @@ var AIRTIME = (function(AIRTIME){
                     
                     return draggingContainer; 
                 },
-                items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing)',
+                items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing, .sb-empty)',
                 cancel: '.sb-footer',
                 receive: fnReceive,
                 update: fnUpdate,