Changeset - ffd428d49720
symposion/boxes/models.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.db import models
 
from django.contrib.auth.models import User
 
from django.utils.encoding import python_2_unicode_compatible
 

	
 
import reversion
...
 
@@ -7,4 +9,5 @@ from markitup.fields import MarkupField
 

	
 

	
 
@python_2_unicode_compatible
 
class Box(models.Model):
 

	
...
 
@@ -15,5 +18,5 @@ class Box(models.Model):
 
    last_updated_by = models.ForeignKey(User, related_name="updated_boxes")
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.label
 

	
symposion/cms/models.py
Show inline comments
...
 
@@ -7,4 +7,5 @@ from django.core.urlresolvers import reverse
 
from django.core.exceptions import ValidationError
 
from django.db import models
 
from django.utils.encoding import python_2_unicode_compatible
 
from django.utils.translation import ugettext_lazy as _
 

	
...
 
@@ -18,4 +19,5 @@ from .managers import PublishedPageManager
 

	
 

	
 
@python_2_unicode_compatible
 
class Page(models.Model):
 

	
...
 
@@ -36,5 +38,5 @@ class Page(models.Model):
 
    published = PublishedPageManager()
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.title
 

	
symposion/conference/apps.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.apps import AppConfig
 

	
symposion/conference/models.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.db import models
 
from django.utils.translation import ugettext_lazy as _
 
from django.utils.encoding import python_2_unicode_compatible
 

	
 
from timezones.fields import TimeZoneField
...
 
@@ -8,4 +10,5 @@ CONFERENCE_CACHE = {}
 

	
 

	
 
@python_2_unicode_compatible
 
class Conference(models.Model):
 
    """
...
 
@@ -22,5 +25,5 @@ class Conference(models.Model):
 
    timezone = TimeZoneField(_("timezone"), blank=True)
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.title
 

	
...
 
@@ -43,4 +46,5 @@ class Conference(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Section(models.Model):
 
    """
...
 
@@ -59,6 +63,6 @@ class Section(models.Model):
 
    end_date = models.DateField(_("end date"), null=True, blank=True)
 

	
 
    def __unicode__(self):
 
        return u"%s %s" % (self.conference, self.name)
 
    def __str__(self):
 
        return "%s %s" % (self.conference, self.name)
 

	
 
    class Meta(object):
symposion/markdown_parser.py
Show inline comments
 
from __future__ import unicode_literals
 
from html5lib import html5parser, sanitizer
 

	
symposion/proposals/actions.py
Show inline comments
 
from __future__ import unicode_literals
 
import csv
 

	
symposion/proposals/apps.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.apps import AppConfig
 

	
symposion/proposals/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
from django import forms
 
from django.db.models import Q
symposion/proposals/models.py
Show inline comments
 
from __future__ import unicode_literals
 
import os
 
import uuid
...
 
@@ -5,4 +6,5 @@ from django.core.urlresolvers import reverse
 
from django.db import models
 
from django.db.models import Q
 
from django.utils.encoding import python_2_unicode_compatible
 
from django.utils.translation import ugettext_lazy as _
 
from django.utils.timezone import now
...
 
@@ -22,4 +24,5 @@ from symposion.speakers.models import Speaker
 

	
 

	
 
@python_2_unicode_compatible
 
class ProposalSection(models.Model):
 
    """
...
 
@@ -56,8 +59,9 @@ class ProposalSection(models.Model):
 
        return True
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.section.name
 

	
 

	
 
@python_2_unicode_compatible
 
class ProposalKind(models.Model):
 
    """
...
 
@@ -73,8 +77,9 @@ class ProposalKind(models.Model):
 
    slug = models.SlugField()
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
 

	
 
@python_2_unicode_compatible
 
class ProposalBase(models.Model):
 

	
...
 
@@ -156,7 +161,11 @@ class ProposalBase(models.Model):
 
        }
 

	
 
    def __str__(self):
 
        return self.title
 

	
 
reversion.register(ProposalBase)
 

	
 

	
 
@python_2_unicode_compatible
 
class AdditionalSpeaker(models.Model):
 

	
...
 
@@ -178,5 +187,5 @@ class AdditionalSpeaker(models.Model):
 
        unique_together = ("speaker", "proposalbase")
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        if self.status is self.SPEAKING_STATUS_PENDING:
 
            return _(u"pending speaker (%s)") % self.speaker.email
symposion/proposals/views.py
Show inline comments
 
from __future__ import unicode_literals
 
import hashlib
 
import random
symposion/reviews/apps.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.apps import AppConfig
 

	
symposion/reviews/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
from django import forms
 

	
symposion/reviews/models.py
Show inline comments
 
# -*- coding: utf-8 -*-
 
from __future__ import unicode_literals
 
from datetime import datetime
 
from decimal import Decimal
...
 
@@ -28,6 +29,6 @@ class Votes(object):
 
    PLUS_ONE = "+1"
 
    PLUS_ZERO = "+0"
 
    MINUS_ZERO = u"−0"
 
    MINUS_ONE = u"−1"
 
    MINUS_ZERO = "−0"
 
    MINUS_ONE = "−1"
 

	
 
    CHOICES = [
symposion/reviews/utils.py
Show inline comments
 
from __future__ import unicode_literals
 

	
 

	
 
def has_permission(user, proposal, speaker=False, reviewer=False):
 
    """
symposion/schedule/admin.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.contrib import admin
 

	
symposion/schedule/apps.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.apps import AppConfig
 

	
symposion/schedule/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
import csv
 
import time
symposion/schedule/helpers.py
Show inline comments
...
 
@@ -3,4 +3,5 @@ This file contains functions that are useful to humans at the shell for
 
manipulating the database in more natural ways.
 
"""
 
from __future__ import unicode_literals
 
from django.db import transaction
 

	
symposion/schedule/models.py
Show inline comments
 
from __future__ import unicode_literals
 
import datetime
 

	
...
 
@@ -4,4 +5,5 @@ from django.core.exceptions import ObjectDoesNotExist
 
from django.contrib.auth.models import User
 
from django.db import models
 
from django.utils.encoding import python_2_unicode_compatible
 

	
 
from markitup.fields import MarkupField
...
 
@@ -12,4 +14,5 @@ from symposion.speakers.models import Speaker
 

	
 

	
 
@python_2_unicode_compatible
 
class Schedule(models.Model):
 

	
...
 
@@ -18,6 +21,6 @@ class Schedule(models.Model):
 
    hidden = models.BooleanField("Hide schedule from overall conference view", default=False)
 

	
 
    def __unicode__(self):
 
        return u"%s Schedule" % self.section
 
    def __str__(self):
 
        return "%s Schedule" % self.section
 

	
 
    class Meta:
...
 
@@ -25,4 +28,5 @@ class Schedule(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Day(models.Model):
 

	
...
 
@@ -30,6 +34,6 @@ class Day(models.Model):
 
    date = models.DateField()
 

	
 
    def __unicode__(self):
 
        return u"%s" % self.date
 
    def __str__(self):
 
        return "%s" % self.date
 

	
 
    class Meta:
...
 
@@ -38,4 +42,5 @@ class Day(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Room(models.Model):
 

	
...
 
@@ -44,8 +49,9 @@ class Room(models.Model):
 
    order = models.PositiveIntegerField()
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
 

	
 
@python_2_unicode_compatible
 
class SlotKind(models.Model):
 
    """
...
 
@@ -57,8 +63,9 @@ class SlotKind(models.Model):
 
    label = models.CharField(max_length=50)
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.label
 

	
 

	
 
@python_2_unicode_compatible
 
class Slot(models.Model):
 

	
...
 
@@ -125,7 +132,7 @@ class Slot(models.Model):
 
        return Room.objects.filter(pk__in=self.slotroom_set.values("room"))
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        roomlist = ' '.join(map(lambda r: r.__unicode__(), self.rooms))
 
        return u"%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
 
        return "%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
 

	
 
    class Meta:
...
 
@@ -133,4 +140,5 @@ class Slot(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class SlotRoom(models.Model):
 
    """
...
 
@@ -141,6 +149,6 @@ class SlotRoom(models.Model):
 
    room = models.ForeignKey(Room)
 

	
 
    def __unicode__(self):
 
        return u"%s %s" % (self.room, self.slot)
 
    def __str__(self):
 
        return "%s %s" % (self.room, self.slot)
 

	
 
    class Meta:
...
 
@@ -149,4 +157,5 @@ class SlotRoom(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Presentation(models.Model):
 

	
...
 
@@ -178,6 +187,6 @@ class Presentation(models.Model):
 
                yield speaker
 

	
 
    def __unicode__(self):
 
        return u"#%s %s (%s)" % (self.number, self.title, self.speaker)
 
    def __str__(self):
 
        return "#%s %s (%s)" % (self.number, self.title, self.speaker)
 

	
 
    class Meta:
...
 
@@ -185,4 +194,5 @@ class Presentation(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Session(models.Model):
 

	
...
 
@@ -207,16 +217,17 @@ class Session(models.Model):
 
            return None
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        start = self.start()
 
        end = self.end()
 
        if start and end:
 
            return u"%s: %s - %s" % (
 
            return "%s: %s - %s" % (
 
                self.day.date.strftime("%a"),
 
                start.strftime("%X"),
 
                end.strftime("%X")
 
            )
 
        return u""
 
        return ""
 

	
 

	
 
@python_2_unicode_compatible
 
class SessionRole(models.Model):
 

	
...
 
@@ -239,5 +250,5 @@ class SessionRole(models.Model):
 
        unique_together = [("session", "user", "role")]
 

	
 
    def __unicode__(self):
 
        return u"%s %s: %s" % (self.user, self.session,
 
                               self.SESSION_ROLE_TYPES[self.role - 1][1])
 
    def __str__(self):
 
        return "%s %s: %s" % (self.user, self.session,
 
                              self.SESSION_ROLE_TYPES[self.role - 1][1])
symposion/schedule/timetable.py
Show inline comments
 
from __future__ import unicode_literals
 
import itertools
 

	
symposion/schedule/urls.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.conf.urls import url, patterns
 

	
symposion/schedule/views.py
Show inline comments
 
from __future__ import unicode_literals
 
import json
 

	
symposion/speakers/admin.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.contrib import admin
 

	
symposion/speakers/apps.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.apps import AppConfig
 

	
symposion/speakers/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
from django import forms
 

	
symposion/speakers/models.py
Show inline comments
 
from __future__ import unicode_literals
 
import datetime
 
from django.utils.encoding import python_2_unicode_compatible
 

	
 
from django.db import models
...
 
@@ -9,4 +11,5 @@ from markitup.fields import MarkupField
 

	
 

	
 
@python_2_unicode_compatible
 
class Speaker(models.Model):
 

	
...
 
@@ -35,9 +38,9 @@ class Speaker(models.Model):
 
        ordering = ['name']
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        if self.user:
 
            return self.name
 
        else:
 
            return u"?"
 
            return "?"
 

	
 
    def get_absolute_url(self):
symposion/speakers/urls.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.conf.urls import patterns, url
 

	
symposion/speakers/views.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.core.exceptions import ObjectDoesNotExist
 
from django.http import Http404
symposion/sponsorship/admin.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.contrib import admin
 
from django.utils.html import escape
symposion/sponsorship/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
from django import forms
 
from django.forms.models import inlineformset_factory, BaseInlineFormSet
symposion/sponsorship/models.py
Show inline comments
 
from __future__ import unicode_literals
 
import datetime
 

	
...
 
@@ -6,4 +7,5 @@ from django.core.urlresolvers import reverse
 
from django.db import models
 
from django.db.models.signals import post_init, post_save
 
from django.utils.encoding import python_2_unicode_compatible
 
from django.utils.translation import ugettext_lazy as _
 

	
...
 
@@ -15,4 +17,5 @@ from symposion.sponsorship.managers import SponsorManager
 

	
 

	
 
@python_2_unicode_compatible
 
class SponsorLevel(models.Model):
 

	
...
 
@@ -28,5 +31,5 @@ class SponsorLevel(models.Model):
 
        verbose_name_plural = _("sponsor levels")
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
...
 
@@ -35,4 +38,5 @@ class SponsorLevel(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class Sponsor(models.Model):
 

	
...
 
@@ -56,5 +60,5 @@ class Sponsor(models.Model):
 
    objects = SponsorManager()
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
...
 
@@ -167,4 +171,5 @@ CONTENT_TYPE_CHOICES = [
 

	
 

	
 
@python_2_unicode_compatible
 
class Benefit(models.Model):
 

	
...
 
@@ -176,8 +181,9 @@ class Benefit(models.Model):
 
                                    max_length=20, default="simple")
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
 

	
 
@python_2_unicode_compatible
 
class BenefitLevel(models.Model):
 

	
...
 
@@ -192,8 +198,9 @@ class BenefitLevel(models.Model):
 
        ordering = ["level"]
 

	
 
    def __unicode__(self):
 
        return u"%s - %s" % (self.level, self.benefit)
 
    def __str__(self):
 
        return "%s - %s" % (self.level, self.benefit)
 

	
 

	
 
@python_2_unicode_compatible
 
class SponsorBenefit(models.Model):
 

	
...
 
@@ -214,6 +221,6 @@ class SponsorBenefit(models.Model):
 
        ordering = ["-active"]
 

	
 
    def __unicode__(self):
 
        return u"%s - %s" % (self.sponsor, self.benefit)
 
    def __str__(self):
 
        return "%s - %s" % (self.sponsor, self.benefit)
 

	
 
    def clean(self):
symposion/sponsorship/views.py
Show inline comments
 
from __future__ import unicode_literals
 
from cStringIO import StringIO
 
import itertools
symposion/teams/forms.py
Show inline comments
 
from __future__ import unicode_literals
 
from django import forms
 

	
symposion/teams/models.py
Show inline comments
 
from __future__ import unicode_literals
 
import datetime
 

	
...
 
@@ -6,4 +7,5 @@ import reversion
 

	
 
from django.contrib.auth.models import Permission, User
 
from django.utils.encoding import python_2_unicode_compatible
 

	
 

	
...
 
@@ -15,4 +17,5 @@ TEAM_ACCESS_CHOICES = [
 

	
 

	
 
@python_2_unicode_compatible
 
class Team(models.Model):
 

	
...
 
@@ -35,5 +38,5 @@ class Team(models.Model):
 
        return ("team_detail", [self.slug])
 

	
 
    def __unicode__(self):
 
    def __str__(self):
 
        return self.name
 

	
symposion/teams/views.py
Show inline comments
 
from __future__ import unicode_literals
 
from django.http import Http404, HttpResponseNotAllowed
 
from django.shortcuts import render, redirect, get_object_or_404
symposion/views.py
Show inline comments
 
from __future__ import unicode_literals
 
import hashlib
 
import random
0 comments (0 inline, 0 general)