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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

Browse source
This commit is contained in:
Rudi Grinberg 2012-10-09 14:46:11 -04:00
commit 0fac533036
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
airtime_mvc/application/models/Show.php
View file

@ -179,14 +179,19 @@ SQL;
if ($deltaDay > 0) {
return "Shows can have a max length of 24 hours.";
}
$utc = new DateTimeZone("UTC");
$nowDateTime = new DateTime("now", $utc);
$showInstances = CcShowInstancesQuery::create()
->filterByDbShowId($this->_showId)
->find($con);
/* Check if the show being resized and any of its repeats * overlap
with other scheduled shows */
$utc = new DateTimeZone("UTC");
/* Check two things:
1. If the show being resized and any of its repeats end in the past
2. If the show being resized and any of its repeats overlap
with other scheduled shows */
foreach ($showInstances as $si) {
$startsDateTime = new DateTime($si->getDbStarts(), new DateTimeZone("UTC"));
@ -201,6 +206,10 @@ SQL;
$newStartsDateTime = Application_Model_ShowInstance::addDeltas($startsDateTime, $deltaDay, $deltaMin);
$newEndsDateTime = Application_Model_ShowInstance::addDeltas($endsDateTime, $deltaDay, $deltaMin);
if ($newEndsDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
return "End date/time cannot be in the past";
}
//convert our new starts/ends to UTC.
$newStartsDateTime->setTimezone($utc);

2
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View file

@ -65,7 +65,7 @@ var AIRTIME = (function(AIRTIME) {
var $el = $(this), selected = mod
.getChosenAudioFilesLength(), container, message, li = $("#side_playlist ul[id='spl_sortable'] li:first"), width = li
.width(), height = li.height();
.width(), height = 55;
// dragging an element that has an unselected
// checkbox.