From 5effb253bf7adb6a2125aebf00c36049789d9fee Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 11:38:47 -0400 Subject: [PATCH 01/13] CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' -done --- .../application/controllers/PlaylistController.php | 7 ++++--- .../views/scripts/playlist/smart-block.phtml | 12 ++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index a2e55034a..d5ee2b89f 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -446,14 +446,13 @@ class PlaylistController extends Zend_Controller_Action $request = $this->getRequest(); $params = $request->getPost(); $result = array(); - - $this->setPlaylistNameDescAction(); - + if ($params['type'] == 'block') { $form = new Application_Form_SmartBlockCriteria(); $form->startForm($params['obj_id']); $bl = new Application_Model_Block($params['obj_id']); if ($form->isValid($params)) { + $this->setPlaylistNameDescAction(); $bl->saveSmartBlockCriteria($params['data']); $result['html'] = $this->createFullResponse($bl, true, true); $result['result'] = 0; @@ -461,6 +460,8 @@ class PlaylistController extends Zend_Controller_Action $this->view->obj = $bl; $this->view->id = $bl->getId(); $this->view->form = $form; + $this->view->unsavedName = $params['name']; + $this->view->unsavedDesc = $params['description']; $viewPath = 'playlist/smart-block.phtml'; $result['html'] = $this->view->render($viewPath); $result['result'] = 1; diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index 9b43655f6..9c37dfffa 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -19,7 +19,12 @@ if (isset($this->obj)) {

- obj->getName(); ?> + + unsavedName)) echo $this->unsavedName; + else echo $this->obj->getName(); + ?> +

length; ?>

@@ -30,7 +35,10 @@ if (isset($this->obj)) {
- +
From e796d4c03d18db6569c2b8c64447c00ec6c93dea Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 11:39:42 -0400 Subject: [PATCH 02/13] MM2: equal signs sexified --- airtime_mvc/application/controllers/ApiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index b3f5bcffc..6d2032693 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -405,9 +405,9 @@ class ApiController extends Zend_Controller_Action public function uploadRecordedAction() { - $show_instance_id = $this->_getParam('showinstanceid'); - $file_id = $this->_getParam('fileid'); - $this->view->fileid = $file_id; + $show_instance_id = $this->_getParam('showinstanceid'); + $file_id = $this->_getParam('fileid'); + $this->view->fileid = $file_id; $this->view->showinstanceid = $show_instance_id; $this->uploadRecordedActionParam($show_instance_id, $file_id); } From 46a6a5fc3095eb613942fc323f542d2a522b4439 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 12:05:41 -0400 Subject: [PATCH 03/13] CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' -added in saving behaviour for regular playlists --- airtime_mvc/application/controllers/PlaylistController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index d5ee2b89f..e7f4c8e8f 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -466,6 +466,8 @@ class PlaylistController extends Zend_Controller_Action $result['html'] = $this->view->render($viewPath); $result['result'] = 1; } + } else if ($params['type'] == 'playlist') { + $this->setPlaylistNameDescAction(); } $result["modified"] = $this->view->modified; From ca66073fb59efe8a4f9e5a26f0413512be866a7e Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 12:31:59 -0400 Subject: [PATCH 04/13] did some reformatting. --- .../application/forms/RegisterAirtime.php | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index a789556fc..9ffd853e1 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -18,8 +18,11 @@ class Application_Form_RegisterAirtime extends Zend_Form } $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/register-dialog.phtml', 'privacyChecked'=>$privacyChecked)), - array('File', array('viewScript' => 'form/register-dialog.phtml', 'placement' => false))) + array('ViewScript', array('viewScript' => + 'form/register-dialog.phtml', 'privacyChecked'=>$privacyChecked)), + + array('File', array('viewScript' => 'form/register-dialog.phtml', + 'placement' => false))) ); // Station Name @@ -36,7 +39,7 @@ class Application_Form_RegisterAirtime extends Zend_Form 'label' => 'Phone:', 'required' => false, 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetPhone(), + 'value' => Application_Model_Preference::GetPhone(), 'decorators' => array( 'ViewHelper' ) @@ -48,7 +51,7 @@ class Application_Form_RegisterAirtime extends Zend_Form 'label' => 'Email:', 'required' => false, 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetEmail(), + 'value' => Application_Model_Preference::GetEmail(), 'decorators' => array( 'ViewHelper' ) @@ -68,10 +71,10 @@ class Application_Form_RegisterAirtime extends Zend_Form // county list dropdown $this->addElement('select', 'Country', array( 'label' => 'Country:', - 'required' => false, + 'required' => false, 'value' => Application_Model_Preference::GetStationCountry(), - 'multiOptions' => $country_list, - 'decorators' => array( + 'multiOptions' => $country_list, + 'decorators' => array( 'ViewHelper' ) )); @@ -128,13 +131,13 @@ class Application_Form_RegisterAirtime extends Zend_Form // text area for sending detail $this->addElement('textarea', 'SendInfo', array( - 'class' => 'sending_textarea', + 'class' => 'sending_textarea', 'required' => false, 'filters' => array('StringTrim'), - 'readonly' => true, - 'rows' => 5, - 'cols' => 61, - 'value' => Application_Model_Preference::GetSystemInfo(false, true), + 'readonly' => true, + 'rows' => 5, + 'cols' => 61, + 'value' => Application_Model_Preference::GetSystemInfo(false, true), 'decorators' => array( 'ViewHelper' ) From 5e180f0ce2b5e025902a0ad2bf46f1c189ac97a3 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 12:57:56 -0400 Subject: [PATCH 05/13] sexified code --- .../application/forms/SmartBlockCriteria.php | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index 55ff54705..4627b7646 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -2,86 +2,86 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { private $criteriaOptions = array( - 0 => "Select criteria", - "album_title" => "Album", - "bit_rate" => "Bit Rate (Kbps)", - "bpm" => "Bpm", - "comments" => "Comments", - "composer" => "Composer", - "conductor" => "Conductor", - "artist_name" => "Creator", - "disc_number" => "Disc Number", - "genre" => "Genre", - "isrc_number" => "ISRC", - "label" => "Label", - "language" => "Language", - "mtime" => "Last Modified", - "lptime" => "Last Played", - "length" => "Length", - "lyricist" => "Lyricist", - "mood" => "Mood", - "name" => "Name", - "orchestra" => "Orchestra", - "rating" => "Rating", - "sample_rate" => "Sample Rate (kHz)", - "track_title" => "Title", + 0 => "Select criteria", + "album_title" => "Album", + "bit_rate" => "Bit Rate (Kbps)", + "bpm" => "Bpm", + "comments" => "Comments", + "composer" => "Composer", + "conductor" => "Conductor", + "artist_name" => "Creator", + "disc_number" => "Disc Number", + "genre" => "Genre", + "isrc_number" => "ISRC", + "label" => "Label", + "language" => "Language", + "mtime" => "Last Modified", + "lptime" => "Last Played", + "length" => "Length", + "lyricist" => "Lyricist", + "mood" => "Mood", + "name" => "Name", + "orchestra" => "Orchestra", + "rating" => "Rating", + "sample_rate" => "Sample Rate (kHz)", + "track_title" => "Title", "track_number" => "Track Number", - "utime" => "Uploaded", - "year" => "Year" + "utime" => "Uploaded", + "year" => "Year" ); private $criteriaTypes = array( - 0 => "", - "album_title" => "s", - "artist_name" => "s", - "bit_rate" => "n", - "bpm" => "n", - "comments" => "s", - "composer" => "s", - "conductor" => "s", - "utime" => "n", - "mtime" => "n", - "lptime" => "n", - "disc_number" => "n", - "genre" => "s", - "isrc_number" => "s", - "label" => "s", - "language" => "s", - "length" => "n", - "lyricist" => "s", - "mood" => "s", - "name" => "s", - "orchestra" => "s", - "rating" => "n", - "sample_rate" => "n", - "track_title" => "s", + 0 => "", + "album_title" => "s", + "artist_name" => "s", + "bit_rate" => "n", + "bpm" => "n", + "comments" => "s", + "composer" => "s", + "conductor" => "s", + "utime" => "n", + "mtime" => "n", + "lptime" => "n", + "disc_number" => "n", + "genre" => "s", + "isrc_number" => "s", + "label" => "s", + "language" => "s", + "length" => "n", + "lyricist" => "s", + "mood" => "s", + "name" => "s", + "orchestra" => "s", + "rating" => "n", + "sample_rate" => "n", + "track_title" => "s", "track_number" => "n", - "year" => "n" + "year" => "n" ); private $stringCriteriaOptions = array( - "0" => "Select modifier", - "contains" => "contains", + "0" => "Select modifier", + "contains" => "contains", "does not contain" => "does not contain", - "is" => "is", - "is not" => "is not", - "starts with" => "starts with", - "ends with" => "ends with" + "is" => "is", + "is not" => "is not", + "starts with" => "starts with", + "ends with" => "ends with" ); private $numericCriteriaOptions = array( - "0" => "Select modifier", - "is" => "is", - "is not" => "is not", + "0" => "Select modifier", + "is" => "is", + "is not" => "is not", "is greater than" => "is greater than", - "is less than" => "is less than", + "is less than" => "is less than", "is in the range" => "is in the range" ); private $limitOptions = array( - "hours" => "hours", + "hours" => "hours", "minutes" => "minutes", - "items" => "items" + "items" => "items" ); public function init() From f483e271f612bd34e54ea0f02f9a6d7e8bba5f34 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 14:50:10 -0400 Subject: [PATCH 06/13] formatting --- airtime_mvc/application/controllers/LibraryController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 9b7331e10..cba555785 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -271,10 +271,10 @@ class LibraryController extends Zend_Controller_Action $user = Application_Model_User::getCurrentUser(); $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); - $files = array(); + $files = array(); $playlists = array(); - $blocks = array(); - $streams = array(); + $blocks = array(); + $streams = array(); $message = null; From 3ca8fe87876ce701b2754bcb05813d7b89f4b90a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 15:17:14 -0400 Subject: [PATCH 07/13] updated upgrade.sql for owner_id --- install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql index 6d08eec03..1f5cf72de 100644 --- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql @@ -104,6 +104,7 @@ CREATE TABLE cc_webstream_metadata ( ALTER TABLE cc_files DROP COLUMN gunid, ADD COLUMN replay_gain character varying(16), + ADD COLUMN owner_id integer; ALTER COLUMN bpm TYPE integer using airtime_to_int(bpm) /* TYPE change - table: cc_files original: character varying(8) new: integer */; ALTER TABLE cc_playlistcontents @@ -154,3 +155,9 @@ ALTER TABLE cc_webstream_metadata ADD CONSTRAINT cc_schedule_inst_fkey FOREIGN KEY (instance_id) REFERENCES cc_schedule(id) ON DELETE CASCADE; DROP FUNCTION airtime_to_int(chartoconvert character varying); + +UPDATE cc_files +SET owner_id=(SELECT id FROM cc_subjs WHERE type='A' LIMIT 1) +WHERE owner_id is NULL + + From fe48780932649259929e0b1a84464bc480858b8f Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 16:00:58 -0400 Subject: [PATCH 08/13] CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up -fixed --- .../controllers/PlaylistController.php | 79 ++++++++++++------- .../js/airtime/playlist/smart_blockbuilder.js | 3 + 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index e7f4c8e8f..ad7ea1fcd 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -97,7 +97,11 @@ class PlaylistController extends Zend_Controller_Action unset($this->view->obj); } } else { - $this->view->html = $this->view->render($viewPath); + if ($isJson) { + return $this->view->render($viewPath); + } else { + $this->view->html = $this->view->render($viewPath); + } } } @@ -112,13 +116,19 @@ class PlaylistController extends Zend_Controller_Action $this->createFullResponse($obj); } - private function playlistNotFound($p_type) + private function playlistNotFound($p_type, $p_isJson = false) { + $p_type = ucfirst($p_type); $this->view->error = "{$p_type} not found"; Logging::info("{$p_type} not found"); Application_Model_Library::changePlaylist(null, $p_type); - $this->createFullResponse(null); + + if ($p_type == 'Playlist') { + $this->createFullResponse(null); + } else { + die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, true)))); + } } private function playlistNoPermission($p_type) @@ -478,26 +488,31 @@ class PlaylistController extends Zend_Controller_Action { $request = $this->getRequest(); $params = $request->getPost(); - $form = new Application_Form_SmartBlockCriteria(); - $form->startForm($params['obj_id']); - $bl = new Application_Model_Block($params['obj_id']); - if ($form->isValid($params)) { - $result = $bl->generateSmartBlock($params['data']); - try { + + //make sure block exists + try { + $bl = new Application_Model_Block($params['obj_id']); + + $form = new Application_Form_SmartBlockCriteria(); + $form->startForm($params['obj_id']); + if ($form->isValid($params)) { + $result = $bl->generateSmartBlock($params['data']); die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true)))); - } catch (PlaylistNotFoundException $e) { - $this->playlistNotFound('block'); - } catch (Exception $e) { - $this->playlistUnknownError($e); + } else { + $this->view->obj = $bl; + $this->view->id = $bl->getId(); + $this->view->form = $form; + $viewPath = 'playlist/smart-block.phtml'; + $result['html'] = $this->view->render($viewPath); + $result['result'] = 1; + die(json_encode($result)); } - } else { - $this->view->obj = $bl; - $this->view->id = $bl->getId(); - $this->view->form = $form; - $viewPath = 'playlist/smart-block.phtml'; - $result['html'] = $this->view->render($viewPath); - $result['result'] = 1; - die(json_encode($result)); + } catch (BlockNotFoundException $e) { + $this->playlistNotFound('block', true); + } catch (PlaylistNotFoundException $e) { + $this->playlistNotFound('block'); + } catch (Exception $e) { + $this->playlistUnknownError($e); } } @@ -505,17 +520,21 @@ class PlaylistController extends Zend_Controller_Action { $request = $this->getRequest(); $params = $request->getPost(); - $bl = new Application_Model_Block($params['obj_id']); - $result = $bl->shuffleSmartBlock(); - - if ($result['result'] == 0) { - try { + try { + $bl = new Application_Model_Block($params['obj_id']); + $result = $bl->shuffleSmartBlock(); + + if ($result['result'] == 0) { die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($bl, true)))); - } catch (PlaylistNotFoundException $e) { - $this->playlistNotFound('block'); + } else { + die(json_encode($result)); } - } else { - die(json_encode($result)); + } catch (BlockNotFoundException $e) { + $this->playlistNotFound('block', true); + } catch (PlaylistNotFoundException $e) { + $this->playlistNotFound('block'); + } catch (Exception $e) { + $this->playlistUnknownError($e); } } diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index 65035d5ef..e53c33f81 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -437,6 +437,9 @@ function callback(data, type) { dt = $('table[id="library_display"]').dataTable(); if (type == 'shuffle' || type == 'generate') { + if (json.error !== undefined) { + alert(json.error); + } AIRTIME.playlist.fnOpenPlaylist(json); var form = $('#smart-block-form'); if (json.result == "0") { From 7c79aad5f41b7b95b8e4dde1289be192b11d061f Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 16:04:40 -0400 Subject: [PATCH 09/13] CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up -removed unnecessary exception catch --- airtime_mvc/application/controllers/PlaylistController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index ad7ea1fcd..3104e31e6 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -509,8 +509,6 @@ class PlaylistController extends Zend_Controller_Action } } catch (BlockNotFoundException $e) { $this->playlistNotFound('block', true); - } catch (PlaylistNotFoundException $e) { - $this->playlistNotFound('block'); } catch (Exception $e) { $this->playlistUnknownError($e); } @@ -531,8 +529,6 @@ class PlaylistController extends Zend_Controller_Action } } catch (BlockNotFoundException $e) { $this->playlistNotFound('block', true); - } catch (PlaylistNotFoundException $e) { - $this->playlistNotFound('block'); } catch (Exception $e) { $this->playlistUnknownError($e); } From 80258f1fb7d632edfbd35195b01c5a32350f53d8 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 16:13:18 -0400 Subject: [PATCH 10/13] CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up -fixed for dragging tracks into deleted blocks --- airtime_mvc/application/controllers/PlaylistController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 3104e31e6..97e2b3d73 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -124,10 +124,10 @@ class PlaylistController extends Zend_Controller_Action Logging::info("{$p_type} not found"); Application_Model_Library::changePlaylist(null, $p_type); - if ($p_type == 'Playlist') { + if (!$p_isJson) { $this->createFullResponse(null); } else { - die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, true)))); + die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, $p_isJson)))); } } @@ -288,6 +288,8 @@ class PlaylistController extends Zend_Controller_Action $this->wrongTypeToPlaylist($obj); } catch (BlockDynamicException $e) { $this->blockDynamic($obj); + } catch (BlockNotFoundException $e) { + $this->playlistNotFound($obj_type); } catch (Exception $e) { $this->playlistUnknownError($e); } From 3ff80fae14ed7bf199003680d75f903fe45db24f Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 16:47:20 -0400 Subject: [PATCH 11/13] CC-4314: Library: Add playlist to playlist shows wrong error message -fixed --- .../js/airtime/library/events/library_playlistbuilder.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 4789c40e1..e4a1d7d93 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -141,7 +141,11 @@ var AIRTIME = (function(AIRTIME){ if (aMediaIds.length > 0) { AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after'); } else { - alert('You can only add tracks to smart blocks.'); + if ($('#obj_type').val() == 'block') { + alert('You can only add tracks to smart blocks.'); + } else if ($('#obj_type').val() == 'playlist') { + alert('You can only add tracks and smart blocks to playlists.'); + } } }); From a7427645d5cf1970b1b7ee28ea7481e1ff962427 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 17:01:55 -0400 Subject: [PATCH 12/13] CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception -fixed --- 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 92ddcdf0d..39ec7af3b 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -137,7 +137,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.href = "/Playlist"', + 'onclick' => 'javascript:document.location.href = "/Library"', 'decorators' => array( 'ViewHelper' ) From 6067cc221f0d43c167e583b37696d123972496fa Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 29 Aug 2012 17:37:02 -0400 Subject: [PATCH 13/13] CC-4279: Library: Searching by criteria "Uploaded from" does not work -fixed --- airtime_mvc/application/models/Datatables.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php index c20bd7260..993c17516 100644 --- a/airtime_mvc/application/models/Datatables.php +++ b/airtime_mvc/application/models/Datatables.php @@ -9,8 +9,8 @@ class Application_Model_Datatables $isRange = false; if (strstr($term, '~')) { $info = explode('~', $term); - $input1 = isset($info[0])?$info[0]:null; - $input2 = isset($info[1])?$info[1]:null; + $input1 = isset($info[0])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[0]):null; + $input2 = isset($info[1])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[1]):null; $isRange = true; } else { $input1 = $term;