delete active pl done for side playlist

This commit is contained in:
naomiaro 2010-12-22 13:05:32 -05:00
parent 461df7b61f
commit b1a4cb5bd4
2 changed files with 29 additions and 9 deletions

View File

@ -19,6 +19,7 @@ class PlaylistController extends Zend_Controller_Action
->addActionContext('set-cue', 'json') ->addActionContext('set-cue', 'json')
->addActionContext('move-item', 'json') ->addActionContext('move-item', 'json')
->addActionContext('close', 'json') ->addActionContext('close', 'json')
->addActionContext('delete-active', 'json')
->initContext(); ->initContext();
$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME); $this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
@ -225,12 +226,20 @@ class PlaylistController extends Zend_Controller_Action
public function deleteActiveAction() public function deleteActiveAction()
{ {
$pl = $this->getPlaylist(); $display = $this->_getParam('view');
$this->closePlaylist($pl);
Playlist::Delete($pl_sess->id);
$pl = $this->getPlaylist();
Playlist::Delete($pl->getId());
$pl_sess = $this->pl_sess;
unset($pl_sess->id); unset($pl_sess->id);
if($display === 'spl') {
$this->view->html = $this->view->render('sideplaylist/index.phtml');
return;
}
$this->_helper->redirector('index');
} }
public function closeAction() public function closeAction()

View File

@ -68,16 +68,26 @@ function moveSPLItem(event, ui) {
$.post(url, setSPLContent); $.post(url, setSPLContent);
} }
function noOpenPL(json) {
$("#side_playlist")
.empty()
.append(json.html);
}
function closeSPL() { function closeSPL() {
var url; var url;
url = '/Playlist/close/format/json/view/spl'; url = '/Playlist/close/format/json/view/spl';
$.post(url, function(json){ $.post(url, noOpenPL);
$("#side_playlist") }
.empty()
.append(json.html); function deleteSPL() {
}); var url;
url = '/Playlist/delete-active/format/json/view/spl';
$.post(url, noOpenPL);
} }
function setUpSPL() { function setUpSPL() {
@ -86,6 +96,7 @@ function setUpSPL() {
$("#spl_sortable" ).bind( "sortstop", moveSPLItem); $("#spl_sortable" ).bind( "sortstop", moveSPLItem);
$("#spl_remove_selected").click(deleteSPLItem); $("#spl_remove_selected").click(deleteSPLItem);
$("#spl_close").click(closeSPL); $("#spl_close").click(closeSPL);
$("#spl_delete").click(deleteSPL);
$("#spl_sortable").droppable(); $("#spl_sortable").droppable();
$("#spl_sortable" ).bind( "drop", addSPLItem); $("#spl_sortable" ).bind( "drop", addSPLItem);