From 0fdd6d8d5797dcd6dd9260dac0cf3d8f62fd14c4 Mon Sep 17 00:00:00 2001
From: Robb Ebright <robbt@azone.org>
Date: Thu, 30 Mar 2017 22:45:29 -0400
Subject: [PATCH] sort autoplaylists alphabetically
---
.../application/forms/AddShowAutoPlaylist.php | 2 +-
airtime_mvc/application/models/Library.php | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/airtime_mvc/application/forms/AddShowAutoPlaylist.php b/airtime_mvc/application/forms/AddShowAutoPlaylist.php
index 83b2f9946..a77cb05b4 100644
--- a/airtime_mvc/application/forms/AddShowAutoPlaylist.php
+++ b/airtime_mvc/application/forms/AddShowAutoPlaylist.php
@@ -23,7 +23,7 @@ class Application_Form_AddShowAutoPlaylist extends Zend_Form_SubForm
$autoPlaylistSelect = new Zend_Form_Element_Select("add_show_autoplaylist_id");
$autoPlaylistSelect->setLabel(_("Select Playlist"));
- $autoPlaylistSelect->setMultiOptions(Application_Model_Library::getPlaylistNames());
+ $autoPlaylistSelect->setMultiOptions(Application_Model_Library::getPlaylistNames(true));
$autoPlaylistSelect->setValue(null);
$autoPlaylistSelect->setDecorators(array('ViewHelper'));
$this->addElement($autoPlaylistSelect);
diff --git a/airtime_mvc/application/models/Library.php b/airtime_mvc/application/models/Library.php
index 36fbbcbba..fcf83148d 100644
--- a/airtime_mvc/application/models/Library.php
+++ b/airtime_mvc/application/models/Library.php
@@ -33,14 +33,23 @@ class Application_Model_Library
}
}
- public static function getPlaylistNames()
+ public static function getPlaylistNames($alphasort = false)
{
+
$playlistNames = array(NULL => _("None"));
+ //if we want to return the playlists sorted alphabetically by name
+ if ($alphasort) {
+ $playlists = CcPlaylistQuery::create()
+ ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)
+ ->orderByname()
+ ->find();
- $playlists = CcPlaylistQuery::create()
- ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)
- ->find();
-
+ }
+ else {
+ $playlists = CcPlaylistQuery::create()
+ ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)
+ ->find();
+ }
foreach ($playlists as $playlist) {
$playlistNames[$playlist->getDbId()] = $playlist->getDbName();
}