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

Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-11-05 11:27:34 -05:00
commit d467abe509
20 changed files with 215 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -323,7 +323,7 @@ class LibraryController extends Zend_Controller_Action
if (isset($file)) {
try {
$res = $file->delete(true);
$res = $file->delete();
} catch (FileNoPermissionException $e) {
$message = $noPermissionMsg;
} catch (Exception $e) {

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

@ -398,13 +398,13 @@ class PreferenceController extends Zend_Controller_Action
public function rescanWatchDirectoryAction()
{
$dir = Application_Model_MusicDir::getDirByPath($this->getRequest()->getParam("dir"));
$id = $dir->getId();
$data = array();
$data['directory'] = $dir->getDirectory();
$data['id'] = $id;
$dir = Application_Model_MusicDir::getDirByPath(
$this->getRequest()->getParam("dir"));
$data = array( 'directory' => $dir->getDirectory(),
'id' => $dir->getId());
Application_Model_RabbitMq::SendMessageToMediaMonitor('rescan_watch', $data);
die();
$dir->unhideFiles();
die(); # Get rid of this ugliness later
}
public function removeWatchDirectoryAction()