Changeset - 6dd80f9ddb6f
[Not reviewed]
0 4 0
Patrick Altman - 9 years ago 2015-09-14 02:34:40
paltman@gmail.com
Fix some flake8 issues
4 files changed with 15 insertions and 6 deletions:
0 comments (0 inline, 0 general)
symposion/schedule/admin.py
Show inline comments
...
 
@@ -25,12 +25,13 @@ class SlotRoomInline(admin.TabularInline):
 

	
 
class SlotAdmin(admin.ModelAdmin):
 
    list_filter = ("day", "kind")
 
    list_display = ("day", "start", "end", "kind", "content")
 
    inlines = [SlotRoomInline]
 

	
 

	
 
class RoomAdmin(admin.ModelAdmin):
 
    list_display = ["name", "order", "schedule"]
 
    list_filter = ["schedule"]
 
    inlines = [SlotRoomInline]
 

	
 

	
symposion/schedule/tests/factories.py
Show inline comments
 
import datetime
 
import random
 

	
 
import factory
 

	
 
from factory import fuzzy
 

	
 
from symposion.schedule.models import Schedule, Day, Slot, SlotKind
 
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:
 
        model = Conference
 

	
 

	
symposion/sponsorship/admin.py
Show inline comments
 
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,
 
    BenefitLevel,
 
    Sponsor,
 
    SponsorBenefit,
 
    SponsorLevel,
 
)
 

	
 

	
 
class BenefitLevelInline(admin.TabularInline):
 
    model = BenefitLevel
 
    extra = 0
 

	
 

	
 
class SponsorBenefitInline(admin.StackedInline):
symposion/sponsorship/models.py
Show inline comments
...
 
@@ -311,16 +311,20 @@ class SponsorBenefit(models.Model):
 
        if self.benefit.type == "file" or self.benefit.type == "weblogo":
 
            return ["upload"]
 
        elif self.benefit.type in ("text", "richtext", "simple", "option"):
 
            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):
 
    if instance:
 
        if instance.benefit.type == "weblogo" and instance.upload:
 
            sponsor = instance.sponsor
0 comments (0 inline, 0 general)