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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-12 14:27:29 -04:00
parent 54d18b7bcd d62ba61ea6
commit b43a1e3032
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/application/models/Schedule.php
View File

@ -942,7 +942,8 @@ SQL;
* Another clean-up is to move all the form manipulation to the proper form class.....
* -Martin
*/
public static function addUpdateShow($data, $controller, $validateStartDate, $originalStartDate=null, $update=false, $instanceId=null)
public static function addUpdateShow($data, $controller, $validateStartDate,
$originalStartDate=null, $update=false, $instanceId=null)
{
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
@ -1076,6 +1077,7 @@ SQL;
}
} else {
if ($isAdminOrPM) {
Logging::info( $data );
Application_Model_Show::create($data);
}
@ -1104,7 +1106,8 @@ SQL;
}
}
public static function checkOverlappingShows($show_start, $show_end, $update=false, $instanceId=null)
public static function checkOverlappingShows($show_start, $show_end,
$update=false, $instanceId=null)
{
$overlapping = false;
/* If a show is being edited, exclude it from the query