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

merge fixes

Browse source
This commit is contained in:
Naomi 2011-01-28 11:34:57 -05:00
parent c673b12046
commit 7bd96a7bf4
2 changed files with 116 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/controllers/ScheduleController.php
View file

@ -280,19 +280,16 @@ class ScheduleController extends Zend_Controller_Action
$user = new User($userInfo->id, $userInfo->type); $user = new User($userInfo->id, $userInfo->type);
$show = new Show($user, $showId); $show = new Show($user, $showId);
$this->view->playlists = $show->searchPlaylistsForShow($start_timestamp);
$this->view->showContent = $show->getShowContent($start_timestamp); $this->view->showContent = $show->getShowContent($start_timestamp);
$this->view->timeFilled = $show->getTimeScheduled($start_timestamp, $end_timestamp); $this->view->timeFilled = $show->getTimeScheduled($start_timestamp, $end_timestamp);
$this->view->showLength = $show->getShowLength($start_timestamp, $end_timestamp); $this->view->showLength = $show->getShowLength($start_timestamp, $end_timestamp);
$this->view->percentFilled = Schedule::getPercentScheduledInRange($start_timestamp, $end_timestamp); $this->view->percentFilled = Schedule::getPercentScheduledInRange($start_timestamp, $end_timestamp);
$this->view->choice = $this->view->render('schedule/find-playlists.phtml');
$this->view->chosen = $this->view->render('schedule/scheduled-content.phtml'); $this->view->chosen = $this->view->render('schedule/scheduled-content.phtml');
$this->view->dialog = $this->view->render('schedule/schedule-show-dialog.phtml'); $this->view->dialog = $this->view->render('schedule/schedule-show-dialog.phtml');
unset($this->view->showContent); unset($this->view->showContent);
unset($this->view->playlists);
} }
public function showListAction() public function showListAction()

4
application/models/StoredFile.php
View file

@ -1814,7 +1814,6 @@ class StoredFile {
$totalRows = $CC_DBC->getOne($sql); $totalRows = $CC_DBC->getOne($sql);
// Where clause // Where clause
if(isset($data["optWhere"])) { if(isset($data["optWhere"])) {
$where[] = join(" AND ", $data["optWhere"]); $where[] = join(" AND ", $data["optWhere"]);
@ -1845,18 +1844,15 @@ class StoredFile {
} }
$where[] = "(".join(" AND ", $outerCond).")"; $where[] = "(".join(" AND ", $outerCond).")";
} }
// End Where clause // End Where clause
// Order By clause // Order By clause
$orderby = array(); $orderby = array();
for($i=0; $i<$data["iSortingCols"]; $i++){ for($i=0; $i<$data["iSortingCols"]; $i++){
$orderby[] = $columnsDisplayed[$data["iSortCol_".$i]]." ".$data["sSortDir_".$i]; $orderby[] = $columnsDisplayed[$data["iSortCol_".$i]]." ".$data["sSortDir_".$i];
} }
$orderby[] = "id"; $orderby[] = "id";
$orderby = join("," , $orderby); $orderby = join("," , $orderby);
// End Order By clause // End Order By clause
//ordered by integer as expected by datatables. //ordered by integer as expected by datatables.