Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
b43a1e3032
1 changed files with 44 additions and 41 deletions
|
@ -942,7 +942,8 @@ SQL;
|
||||||
* Another clean-up is to move all the form manipulation to the proper form class.....
|
* Another clean-up is to move all the form manipulation to the proper form class.....
|
||||||
* -Martin
|
* -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();
|
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||||
$user = new Application_Model_User($userInfo->id);
|
$user = new Application_Model_User($userInfo->id);
|
||||||
|
@ -1076,6 +1077,7 @@ SQL;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($isAdminOrPM) {
|
if ($isAdminOrPM) {
|
||||||
|
Logging::info( $data );
|
||||||
Application_Model_Show::create($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;
|
$overlapping = false;
|
||||||
/* If a show is being edited, exclude it from the query
|
/* If a show is being edited, exclude it from the query
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue