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

cc-1665: fix broken checkin for webstream

This commit is contained in:
Martin Konecny 2012-09-13 16:11:06 -04:00
parent da72c00f28
commit 505b53fa16
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/application/controllers/WebstreamController.php
View File

@ -24,7 +24,7 @@ class WebstreamController extends Zend_Controller_Action
$webstream = new CcWebstream(); $webstream = new CcWebstream();
//we're not saving this primary key in the DB so it's OK //we're not saving this primary key in the DB so it's OK to be -1
$webstream->setDbId(-1); $webstream->setDbId(-1);
$webstream->setDbName("Untitled Webstream"); $webstream->setDbName("Untitled Webstream");
$webstream->setDbDescription(""); $webstream->setDbDescription("");
@ -34,7 +34,6 @@ class WebstreamController extends Zend_Controller_Action
$webstream->setDbCreatorId($userInfo->id); $webstream->setDbCreatorId($userInfo->id);
$webstream->setDbUtime(new DateTime("now", new DateTimeZone('UTC'))); $webstream->setDbUtime(new DateTime("now", new DateTimeZone('UTC')));
$webstream->setDbMtime(new DateTime("now", new DateTimeZone('UTC'))); $webstream->setDbMtime(new DateTime("now", new DateTimeZone('UTC')));
//$webstream->save();
/* /*
$type = "stream"; $type = "stream";
@ -50,7 +49,7 @@ class WebstreamController extends Zend_Controller_Action
//clear the session in case an old playlist was open: CC-4196 //clear the session in case an old playlist was open: CC-4196
Application_Model_Library::changePlaylist(null, null); Application_Model_Library::changePlaylist(null, null);
$this->view->obj = new Application_Model_Webstream($webstream->getDbId()); $this->view->obj = new Application_Model_Webstream($webstream);
$this->view->action = "new"; $this->view->action = "new";
$this->view->html = $this->view->render('webstream/webstream.phtml'); $this->view->html = $this->view->render('webstream/webstream.phtml');
} }
@ -68,7 +67,7 @@ class WebstreamController extends Zend_Controller_Action
if ($webstream) { if ($webstream) {
Application_Model_Library::changePlaylist($id, "stream"); Application_Model_Library::changePlaylist($id, "stream");
} }
$this->view->obj = new Application_Model_Webstream($webstream->getDbId()); $this->view->obj = new Application_Model_Webstream($webstream);
$this->view->action = "edit"; $this->view->action = "edit";
$this->view->html = $this->view->render('webstream/webstream.phtml'); $this->view->html = $this->view->render('webstream/webstream.phtml');
} }