From cde8e07c0b3311fa9df360a79e3ca2252df493b7 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 4 Apr 2012 16:26:28 -0400
Subject: [PATCH 1/3] CC-3581: Calendar->It should not be possible to change
 the duration for the recorded show

- fixed
---
 airtime_mvc/application/models/MusicDir.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/airtime_mvc/application/models/MusicDir.php b/airtime_mvc/application/models/MusicDir.php
index 1962cdb87..e94375542 100644
--- a/airtime_mvc/application/models/MusicDir.php
+++ b/airtime_mvc/application/models/MusicDir.php
@@ -368,6 +368,7 @@ class Application_Model_MusicDir {
         $dirs = CcMusicDirsQuery::create()
                     ->filterByType(array("watched", "stor"))
                     ->filterByExists(true)
+                    ->filterByWatched(true)
                     ->find();
 
         foreach($dirs as $dir) {

From 35d2ded26be917039d163141a6079836a9449971 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Thu, 5 Apr 2012 10:47:35 +0200
Subject: [PATCH 2/3] 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'
             )

From cf2813a5458b352ab1ba82640894e78fce74e595 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Thu, 5 Apr 2012 10:56:06 +0200
Subject: [PATCH 3/3] CC-3597 : Playlist->Library->Edit Metadata: Throw
 exception after click "Cancel" at "Edit Metadata" page

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

diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 7cf746ce6..a492f1ac5 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -133,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="/Playlist"',
+            'onclick' => 'javascript:document.location = document.referrer',
             'decorators' => array(
                 'ViewHelper'
             )