diff --git a/symposion/schedule/admin.py b/symposion/schedule/admin.py index 41a6e697681b0afdca477bcd20816911fc90e25e..69f16be054f6b8f4b2ba793b18a4021e01a0e919 100644 --- a/symposion/schedule/admin.py +++ b/symposion/schedule/admin.py @@ -28,6 +28,7 @@ class SlotAdmin(admin.ModelAdmin): list_display = ("day", "start", "end", "kind", "content") inlines = [SlotRoomInline] + class RoomAdmin(admin.ModelAdmin): list_display = ["name", "order", "schedule"] list_filter = ["schedule"] diff --git a/symposion/schedule/tests/factories.py b/symposion/schedule/tests/factories.py index ccddb58c070e9f3e876a949ccbc00494c9717e27..6e24846b6e64dd99e3db0adc665275fcebf16070 100644 --- a/symposion/schedule/tests/factories.py +++ b/symposion/schedule/tests/factories.py @@ -2,6 +2,7 @@ import datetime import random import factory + from factory import fuzzy from symposion.schedule.models import Schedule, Day, Slot, SlotKind @@ -11,8 +12,9 @@ from symposion.conference.models import Section, Conference class ConferenceFactory(factory.DjangoModelFactory): title = fuzzy.FuzzyText() start_date = fuzzy.FuzzyDate(datetime.date(2014, 1, 1)) - end_date = fuzzy.FuzzyDate(datetime.date(2014, 1, 1) - + datetime.timedelta(days=random.randint(1, 10))) + end_date = fuzzy.FuzzyDate( + datetime.date(2014, 1, 1) + datetime.timedelta(days=random.randint(1, 10)) + ) # timezone = TimeZoneField("UTC") class Meta: diff --git a/symposion/sponsorship/admin.py b/symposion/sponsorship/admin.py index 39f66f80759cce6aa769f469ec8b12422e989c9a..15b09439151f9a78afaca7c4f876f6ed705aa34a 100644 --- a/symposion/sponsorship/admin.py +++ b/symposion/sponsorship/admin.py @@ -1,10 +1,11 @@ from __future__ import unicode_literals -from django.contrib import admin from django.utils.html import escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ +from django.contrib import admin + from symposion.sponsorship.models import ( Benefit, BENEFITS, @@ -14,6 +15,7 @@ from symposion.sponsorship.models import ( SponsorLevel, ) + class BenefitLevelInline(admin.TabularInline): model = BenefitLevel extra = 0 diff --git a/symposion/sponsorship/models.py b/symposion/sponsorship/models.py index 20d4de09e800804f1be26a3816e7a57ba2f7fcb8..30a086ff37ae02ed2488e833aab49dc01ee8ced6 100644 --- a/symposion/sponsorship/models.py +++ b/symposion/sponsorship/models.py @@ -314,10 +314,14 @@ class SponsorBenefit(models.Model): return ["text"] return [] + def _is_text_benefit(self): + return self.benefit.type in ["text", "richtext", "simple"] and bool(self.text) + + def _is_upload_benefit(self): + return self.benefit.type in ["file", "weblogo"] and bool(self.upload) + def _is_complete(self): - return self.active and \ - ((self.benefit.type in ('text', 'richtext', 'simple') and bool(self.text)) - or (self.benefit.type in ('file', 'weblogo') and bool(self.upload))) + return self.active and (self._is_text_benefit() or self._is_upload_benefit()) def _denorm_weblogo(sender, instance, created, **kwargs):