diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index e3e9e8246..73ad7fc59 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -27,6 +27,7 @@ class WebstreamController extends Zend_Controller_Action $webstream->setDbName("Untitled Webstream"); $this->view->ws = new Application_Model_Webstream($webstream); + $this->view->action = "new"; $this->view->html = $this->view->render('webstream/webstream.phtml'); } @@ -41,6 +42,7 @@ class WebstreamController extends Zend_Controller_Action $webstream = CcWebstreamQuery::create()->findPK($id); $this->view->ws = new Application_Model_Webstream($webstream); + $this->view->action = "edit"; $this->view->html = $this->view->render('webstream/webstream.phtml'); } diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml index 6f5653cdc..d3660bfc4 100644 --- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml +++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml @@ -1,6 +1,6 @@ ws)) : ?> - + ws)) : ?> diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index dedd7c2b1..92bf939c9 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -360,7 +360,6 @@ var AIRTIME = (function(AIRTIME){ appendAddButton(); appendModAddButton(); removeButtonCheck(); - } //sets events dynamically for playlist entries (each row in the playlist) @@ -600,6 +599,9 @@ var AIRTIME = (function(AIRTIME){ var $ws_id = $("#ws_id"); $ws_id.attr("value", json.streamId); + var $ws_id = $("#ws_delete"); + $ws_id.show(); + //redraw the library to show the new webstream redrawLib(); }