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

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

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-18 17:09:22 -04:00
commit 0e407a05be
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/Block.php
View file

@ -1291,6 +1291,10 @@ SQL;
} else { } else {
$qry->add($spCriteria, $spCriteriaValue, $spCriteriaModifier); $qry->add($spCriteria, $spCriteriaValue, $spCriteriaModifier);
} }
if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) {
$qry->addOr($spCriteria, null, Criteria::ISNULL);
}
} catch (Exception $e) { } catch (Exception $e) {
Logging::info($e); Logging::info($e);
} }

10
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -255,8 +255,8 @@ function eventRender(event, element, view) {
} }
//add scheduled show content empty icon //add scheduled show content empty icon
addIcon = checkEmptyShowStatus(event); //addIcon = checkEmptyShowStatus(event);
if (!addIcon) { //if (!addIcon) {
if (view.name === 'agendaDay' || view.name === 'agendaWeek') { if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) { if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
if (event.soundcloud_id === -1) { if (event.soundcloud_id === -1) {
@ -282,7 +282,7 @@ function eventRender(event, element, view) {
} }
} }
} }
} //}
//rebroadcast icon //rebroadcast icon
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) { if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
@ -518,6 +518,7 @@ function addQtipToSCIcons(ele){
* This gets checked when we are deciding if the show-empty icon should be added * This gets checked when we are deciding if the show-empty icon should be added
* at the beginning of an event render callback. * at the beginning of an event render callback.
*/ */
/*
function checkEmptyShowStatus(e) { function checkEmptyShowStatus(e) {
var currDate = new Date(); var currDate = new Date();
var endTime; var endTime;
@ -541,6 +542,7 @@ function checkEmptyShowStatus(e) {
return showOver; return showOver;
} }
} }
*/
//Alert the error and reload the page //Alert the error and reload the page
//this function is used to resolve concurrency issue //this function is used to resolve concurrency issue
@ -552,7 +554,7 @@ function alertShowErrorAndReload(){
$(document).ready(function(){ $(document).ready(function(){
setInterval( "checkSCUploadStatus()", 5000 ); setInterval( "checkSCUploadStatus()", 5000 );
setInterval( "getCurrentShow()", 5000 ); setInterval( "getCurrentShow()", 5000 );
setInterval( "checkEmptyShowStatus()", 5000 ); //setInterval( "checkEmptyShowStatus()", 5000 );
}); });
var view_name; var view_name;