diff --git a/.pylintrc b/.pylintrc index 26d9ad8..4163f3b 100644 --- a/.pylintrc +++ b/.pylintrc @@ -19,6 +19,4 @@ disable= R0915, R1705, W0511, - W5102, - W5103, W5104, diff --git a/db/base/models.py b/db/base/models.py index b0a106a..534b53e 100644 --- a/db/base/models.py +++ b/db/base/models.py @@ -213,10 +213,14 @@ class TransmitterSuggestionManager(models.Manager): return TransmitterEntry.objects.filter(reviewed=False) +@python_2_unicode_compatible class TransmitterSuggestion(TransmitterEntry): """TransmitterSuggestion is an unreviewed TransmitterEntry object""" objects = TransmitterSuggestionManager() + def __str__(self): + return self.description + class Meta: proxy = True permissions = (('approve', 'Can approve/reject transmitter suggestions'), ) @@ -240,12 +244,16 @@ class TransmitterManager(models.Manager): ).filter(created=Subquery(subquery.values('created')[:1])) +@python_2_unicode_compatible class Transmitter(TransmitterEntry): """Associates a generic Transmitter object with their TransmitterEntries that are managed by TransmitterManager """ objects = TransmitterManager() + def __str__(self): + return self.description + class Meta: proxy = True diff --git a/db/base/views.py b/db/base/views.py index df8d749..fb914c7 100644 --- a/db/base/views.py +++ b/db/base/views.py @@ -106,7 +106,7 @@ def satellite(request, norad): try: latest_frame = DemodData.objects.filter(satellite=satellite_obj).order_by('-id')[0] - except ObjectDoesNotExist: + except (ObjectDoesNotExist, IndexError): latest_frame = '' return render(