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

Merge branch 'cc-4961-show-linking'

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
This commit is contained in:
denise 2013-04-29 15:35:16 -04:00
commit 71526a94cc
36 changed files with 3830 additions and 786 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/ShowInstance.php
View file

@ -391,7 +391,7 @@ SQL;
* @param int $plId
* Playlist ID.
*/
public function addPlaylistToShow($pl_id, $checkUserPerm = true)
/*public function addPlaylistToShow($pl_id, $checkUserPerm = true)
{
$ts = intval($this->_showInstance->getDbLastScheduled("U")) ? : 0;
$id = $this->_showInstance->getDbId();
@ -401,7 +401,7 @@ SQL;
array(array("id" => 0, "instance" => $id, "timestamp" => $ts)),
array(array("id" => $pl_id, "type" => "playlist"))
);
}
}*/
/**
* Add a media file as the last item in the show.
@ -427,12 +427,12 @@ SQL;
* @param array $plIds
* An array of playlist IDs.
*/
public function scheduleShow($plIds)
/*public function scheduleShow($plIds)
{
foreach ($plIds as $plId) {
$this->addPlaylistToShow($plId);
}
}
}*/
public function clearShow()
{