Skip to content
Snippets Groups Projects
Commit a9e243c9 authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

Corrected mistakes made before in now playing.

parent 57cbdfa4
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ from django.shortcuts import render_to_response ...@@ -5,7 +5,7 @@ from django.shortcuts import render_to_response
from django.http import HttpResponse from django.http import HttpResponse
from django import forms from django import forms
from models import Master, Standby, State from models import Master, Standby, State
from program.models import TimeSlot from program.models import TimeSlot, Note
import json import json
import time import time
...@@ -62,12 +62,18 @@ def _get_show(datetime=None): ...@@ -62,12 +62,18 @@ def _get_show(datetime=None):
timeslot = TimeSlot.objects.get(start__lte=datetime, end__gt=datetime) timeslot = TimeSlot.objects.get(start__lte=datetime, end__gt=datetime)
else: else:
timeslot = TimeSlot.objects.get_or_create_current() timeslot = TimeSlot.objects.get_or_create_current()
except (ObjectDoesNotExist, MultipleObjectsReturned):
return {'start': None, 'id': None, 'name': None}
else:
try:
note = timeslot.note
except ObjectDoesNotExist:
note = None
return {'start': _dtstring(timeslot.start.timetuple()), return {'start': _dtstring(timeslot.start.timetuple()),
'id': timeslot.show.id, 'id': timeslot.show.id,
'name': timeslot.show.name, 'name': timeslot.show.name,
'note': timeslot.note} 'note': note}
except (ObjectDoesNotExist, MultipleObjectsReturned):
return {'start': None, 'id': None, 'name': None}
def _current(): def _current():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment