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

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

This commit is contained in:
drigato 2015-01-13 15:50:20 -05:00
parent c264747a54 2185fc9ca4
commit a4461dc79a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,7 +377,7 @@ SQL;
public function delete() public function delete()
{ {
// Check if the file is scheduled to be played in the future // Check if the file is scheduled to be played in the future
if (Application_Model_Schedule::IsFileScheduledInTheFuture($this->getId())) { if (Application_Model_Schedule::IsFileScheduledInTheFuture($this->_file->getCcFileId())) {
throw new DeleteScheduledFileException(); throw new DeleteScheduledFileException();
} }

5
airtime_mvc/application/models/airtime/CcFiles.php
View File

@ -140,4 +140,9 @@ class CcFiles extends BaseCcFiles {
return null; return null;
} }
public function getCcFileId()
{
return $this->id;
}
} // CcFiles } // CcFiles