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

Merge branch 'saas-dev' into saas-showbuilder

Browse source 
Conflicts:
	airtime_mvc/public/css/styles.css
This commit is contained in:
Duncan Sommerville 2015-07-20 12:23:11 -04:00
commit ba90b1f1eb
27 changed files with 454 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,6 @@ class LibraryController extends Zend_Controller_Action
->addActionContext('delete-group', 'json')
->addActionContext('context-menu', 'json')
->addActionContext('get-file-metadata', 'html')
->addActionContext('upload-file-soundcloud', 'json')
->addActionContext('get-upload-to-soundcloud-status', 'json')
->addActionContext('set-num-entries', 'json')
->addActionContext('edit-file-md', 'json')
->initContext();
@ -276,7 +274,7 @@ class LibraryController extends Zend_Controller_Action
$menu["sep1"] = "-----------";
//create a sub menu for Soundcloud actions.
$menu["soundcloud"] = array("name" => _("Soundcloud"), "icon" => "soundcloud", "items" => array());
$menu["soundcloud"] = array("name" => _(SOUNDCLOUD), "icon" => "soundcloud", "items" => array());
$serviceId = $soundcloudService->getServiceId($id);
if (!is_null($file) && $serviceId != 0) {