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

Merge remote-tracking branch 'sf/2.2.x' into cc-4585

This commit is contained in:
Rudi Grinberg 2012-11-05 09:19:20 -05:00
parent 7e03333496 106b18bf30
commit e01a61208d
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
airtime_mvc/application/models/StoredFile.php
View File

@ -335,7 +335,7 @@ SQL;
* @param boolean $p_deleteFile * @param boolean $p_deleteFile
* *
*/ */
public function delete($deleteFromPlaylist=false) public function delete()
{ {
$filepath = $this->getFilePath(); $filepath = $this->getFilePath();
@ -359,9 +359,6 @@ SQL;
Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data); Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
} }
if ($deleteFromPlaylist) {
Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
}
// set file_exists falg to false // set file_exists falg to false
$this->_file->setDbHidden(true); $this->_file->setDbHidden(true);
$this->_file->save(); $this->_file->save();

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -369,6 +369,9 @@ var AIRTIME = (function(AIRTIME){
$.each($("div .big_play"), function(index, value){ $.each($("div .big_play"), function(index, value){
if ($(value).attr('blockId') === undefined) { if ($(value).attr('blockId') === undefined) {
var mime = $(value).attr("data-mime-type"); var mime = $(value).attr("data-mime-type");
//If mime is undefined it is likely because the file was
//deleted from the library. This case is handled in mod.onReady()
if (mime !== undefined) {
if (isAudioSupported(mime)) { if (isAudioSupported(mime)) {
$(value).bind("click", openAudioPreview); $(value).bind("click", openAudioPreview);
} else { } else {
@ -393,6 +396,7 @@ var AIRTIME = (function(AIRTIME){
}, },
}) })
} }
}
} else { } else {
if ($(value).attr('blocktype') === 'dynamic') { if ($(value).attr('blocktype') === 'dynamic') {
$(value).attr("class", "big_play_disabled dark_class"); $(value).attr("class", "big_play_disabled dark_class");