Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-3290: A file should be removed from playlists if it is removed 

through the interface

- fixed
This commit is contained in:
James 2012-01-31 16:12:11 -05:00
parent 5d02581d38
commit 4ffe79a286
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ class LibraryController extends Zend_Controller_Action
return;
}
$res = $file->delete();
$res = $file->delete(true);
if (PEAR::isError($res)) {
$this->view->message = $res->getMessage();

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

@ -303,7 +303,7 @@ class Application_Model_StoredFile {
*
* @return void|PEAR_Error
*/
public function delete()
public function delete($deleteFromPlaylist=false)
{
if ($this->exists()) {
if ($this->getFormat() == 'audioclip') {
@ -314,8 +314,9 @@ class Application_Model_StoredFile {
}
}
// don't delete from the playslist. We might want to put a flag
//Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
if($deleteFromPlaylist){
Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
}
// set file_exists falg to false
$this->_file->setDbFileExists(false);