From 8af91f39011c57f89535d11c6efbc0f6efe7d580 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 11 Sep 2012 15:02:12 -0400
Subject: [PATCH 1/3] -webstream controller wasn't setting webstream object
 properly

---
 airtime_mvc/application/controllers/WebstreamController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index 1a9f6e67c..d0b1ebf42 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -50,7 +50,7 @@ class WebstreamController extends Zend_Controller_Action
         //clear the session in case an old playlist was open: CC-4196
         Application_Model_Library::changePlaylist(null, null);
 
-        $this->view->obj = new Application_Model_Webstream($webstream);
+        $this->view->obj = new Application_Model_Webstream($webstream->getDbId());
         $this->view->action = "new";
         $this->view->html = $this->view->render('webstream/webstream.phtml');
     }

From 1ba24a8d0b02d853da102d106459a20ed6bd53e9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 11 Sep 2012 15:09:57 -0400
Subject: [PATCH 2/3] CC-4353: Numeric search fields in Library would benefit
 from format labels

- done
---
 airtime_mvc/public/js/airtime/library/library.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 78efad4ed..680c33144 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -350,10 +350,22 @@ var AIRTIME = (function(AIRTIME) {
             $.each(aoCols, function(i,ele){
                 if (ele.bSearchable) {
                     var currentColId = ele._ColReorder_iOrigCol;
+                    var label = "";
+                    console.log(ele);
+                    if (ele.mDataProp == "bit_rate") {
+                        label = " (bps)";
+                    } else if (ele.mDataProp == "utime" || ele.mDataPro == "mtime" || ele.mDataPro == "lptime") {
+                        label = " (yyyy-mm-dd)";
+                    } else if (ele.mDataProp == "length") {
+                        label = " (hh:mm:ss.t)";
+                    } else if (ele.mDataProp == "sample_rate") {
+                        label = " (Hz)";
+                    }
+                    
                     if (ele.bVisible) {
-                        advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"'><span>"+ele.sTitle+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
+                        advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
                     } else {
-                        advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' style='display:none;'><span>"+ele.sTitle+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
+                        advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' style='display:none;'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
                     }
                     if (criteriaTypes[ele.mDataProp] == "s") {
                         var obj = { sSelector: "#"+ele.mDataProp }

From bc355fe7a7d843ba65db14948316ea8d57db7f45 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 11 Sep 2012 15:10:30 -0400
Subject: [PATCH 3/3] - webstream controller wasn't assigning webstream object
 properly

---
 airtime_mvc/application/controllers/WebstreamController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index d0b1ebf42..0a691246f 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -68,7 +68,7 @@ class WebstreamController extends Zend_Controller_Action
         if ($webstream) {
             Application_Model_Library::changePlaylist($id, "stream");
         }
-        $this->view->obj = new Application_Model_Webstream($webstream);
+        $this->view->obj = new Application_Model_Webstream($webstream->getDbId());
         $this->view->action = "edit";
         $this->view->html = $this->view->render('webstream/webstream.phtml');
     }