Merge branch 'master' of dev.sourcefabric.org:airtime

Conflicts: application/models/Shows.php
2011-03-22 10:00:37 -04:00 · 2011-03-22 10:00:37 -04:00 · b650abcbb8
commit b650abcbb8
parent d38e2adb58 730df4c345
24 changed files with 446 additions and 88 deletions
--- a/application/models/Shows.php
+++ b/application/models/Shows.php
@ -738,6 +738,14 @@ class ShowInstance {
        RabbitMq::PushSchedule();
 	}

+    public function setRecordedFile($file_id)
+    {
+        $showInstance = CcShowInstancesQuery::create()
+            ->findPK($this->_instanceId);
+        $showInstance->setDbRecordedFile($file_id)
+            ->save();
+    }
+
    public function getTimeScheduled()
    {
        $instance_id = $this->getShowInstanceId();