Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-84: Smart Playlists

Browse source 
- changed name of 'block' to 'smart playlist' on UI only
This commit is contained in:
denise 2012-07-26 13:16:29 -04:00
parent 3df0f2d26e
commit a828c46d32
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/application/controllers/LibraryController.php
View file

@ -57,7 +57,11 @@ class LibraryController extends Zend_Controller_Action
$obj = new Application_Model_Block($this->obj_sess->id);
}
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
$menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} else {
$menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
}
}
}
if ($isAdminOrPM) {
@ -73,7 +77,11 @@ class LibraryController extends Zend_Controller_Action
} else {
$obj = new Application_Model_Block($id);
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
$menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} else {
$menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
}
}
}

2
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -219,7 +219,7 @@ class PlaylistController extends Zend_Controller_Action
$name = 'Untitled Playlist';
if ($type == 'block') {
$name = 'Untitled Smart Block';
$name = 'Untitled Smart Playlist';
}
$obj = new $objInfo['className']();