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

error messages for show moving/resizing displayed in an alert.

This commit is contained in:
naomiaro 2011-02-05 22:02:45 -05:00
parent 55eddb133b
commit cb3f4dd31e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/Shows.php
View File

@ -441,7 +441,7 @@ class ShowInstance {
$overlap = Show::getShows($new_starts, $new_ends, array($this->_instanceId)); $overlap = Show::getShows($new_starts, $new_ends, array($this->_instanceId));
if(count($overlap) > 0) { if(count($overlap) > 0) {
return $overlap; return "Should not overlap shows";
} }
$this->moveScheduledShowContent($deltaDay, $hours, $mins); $this->moveScheduledShowContent($deltaDay, $hours, $mins);
@ -471,7 +471,7 @@ class ShowInstance {
$overlap = Show::getShows($ends, $new_ends); $overlap = Show::getShows($ends, $new_ends);
if(count($overlap) > 0) { if(count($overlap) > 0) {
return $overlap; return "Should not overlap shows";
} }
} }
//have to check if any scheduled content still fits. //have to check if any scheduled content still fits.

2
public/js/airtime/schedule/full-calendar-functions.js
View File

@ -117,6 +117,7 @@ function eventDrop(event, dayDelta, minuteDelta, allDay, revertFunc, jsEvent, ui
{day: dayDelta, min: minuteDelta, showInstanceId: event.id}, {day: dayDelta, min: minuteDelta, showInstanceId: event.id},
function(json){ function(json){
if(json.error) { if(json.error) {
alert(json.error);
revertFunc(); revertFunc();
} }
}); });
@ -131,6 +132,7 @@ function eventResize( event, dayDelta, minuteDelta, revertFunc, jsEvent, ui, vie
{day: dayDelta, min: minuteDelta, showInstanceId: event.id}, {day: dayDelta, min: minuteDelta, showInstanceId: event.id},
function(json){ function(json){
if(json.error) { if(json.error) {
alert(json.error);
revertFunc(); revertFunc();
} }
}); });