From 35d2ded26be917039d163141a6079836a9449971 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 5 Apr 2012 10:47:35 +0200 Subject: [PATCH] CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page --- .../controllers/LibraryController.php | 4 ---- airtime_mvc/application/forms/EditAudioMD.php | 21 +------------------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 36537c282..b3ca1dc79 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -27,10 +27,6 @@ class LibraryController extends Zend_Controller_Action $this->search_sess = new Zend_Session_Namespace("search"); } - public function indexAction() { - - } - public function contextMenuAction() { $id = $this->_getParam('id'); diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index 107c23d53..7cf746ce6 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -2,25 +2,6 @@ class Application_Form_EditAudioMD extends Zend_Form { - /* - "title": "track_title",\ - "artist": "artist_name",\ - "album": "album_title",\ - "genre": "genre",\ - "mood": "mood",\ - "tracknumber": "track_number",\ - "bpm": "bpm",\ - "organization": "label",\ - "composer": "composer",\ - "encodedby": "encoded_by",\ - "conductor": "conductor",\ - "date": "year",\ - "website": "info_url",\ - "isrc": "isrc_number",\ - "copyright": "copyright",\ - */ - - public function init() { // Set the method for the display form to POST @@ -152,7 +133,7 @@ class Application_Form_EditAudioMD extends Zend_Form 'ignore' => true, 'class' => 'ui-button ui-state-default ui-button-text-only md-cancel', 'label' => 'Cancel', - 'onclick' => 'javascript:document.location="/Library"', + 'onclick' => 'javascript:document.location="/Playlist"', 'decorators' => array( 'ViewHelper' )