symposion_app Changeset - 5c07d3e9454b

Changeset - 5c07d3e9454b

Parent rev.

Child rev.

[Not reviewed]

0 11 0

Martin Brochhaus - 10 years ago 2014-01-11 06:50:04
mbrochh@gmail.com

Django 1.6 compatibility

11 files changed with 25 insertions and 22 deletions:

symposion/boxes/urls.py

symposion/cms/urls.py

symposion/conference/urls.py

symposion/proposals/models.py

symposion/proposals/urls.py

symposion/proposals/views.py

symposion/reviews/urls.py

symposion/schedule/urls.py

symposion/speakers/urls.py

symposion/sponsorship/urls.py

symposion/teams/urls.py

0 comments (0 inline, 0 general)

symposion/boxes/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import url, patterns
 from django.conf.urls import url, patterns
 urlpatterns = patterns("symposion.boxes.views",
     url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"),
+)
@@ ... / \ No newline at end of file @@
+)

symposion/cms/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import url, patterns
 from django.conf.urls import url, patterns
 PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/"
 urlpatterns = patterns("symposion.cms.views",
     url(r"^files/$", "file_index", name="file_index"),
     url(r"^files/create/$", "file_create", name="file_create"),

symposion/conference/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 urlpatterns = patterns("symposion.conference.views",
     url(r"^users/$", "user_list", name="user_list"),
+)

symposion/proposals/models.py

➞

Show inline comments

 import datetime
 import os
 import uuid
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 from django.contrib.auth.models import User
 import reversion
 from markitup.fields import MarkupField
@@ ... / @@ -34,26 +34,24 @@ class ProposalSection(models.Model): @@
     end = models.DateTimeField(null=True, blank=True)
     closed = models.NullBooleanField()
     published = models.NullBooleanField()
     @classmethod
     def available(cls):
         now = datetime.datetime.now()
         return cls._default_manager.filter(
             Q(start__lt=now) | Q(start=None),
             Q(end__gt=now) | Q(end=None),
             Q(start__lt=now()) | Q(start=None),
             Q(end__gt=now()) | Q(end=None),
             Q(closed=False) | Q(closed=None),
+        )
     def is_available(self):
         if self.closed:
             return False
         now = datetime.datetime.now()
         if self.start and self.start > now:
         if self.start and self.start > now():
             return False
         if self.end and self.end < now:
+        if self.end and self.end < now():
             return False
         return True
     def __unicode__(self):
         return self.section.name
@@ ... / @@ -93,13 +91,13 @@ class ProposalBase(models.Model): @@
+    )
     additional_notes = MarkupField(
         blank=True,
         help_text=_("Anything else you'd like the program committee to know when making their selection: your past experience, etc. This is not made public. Edit using <a href='http://daringfireball.net/projects/markdown/basics' target='_blank'>Markdown</a>.")
+    )
     submitted = models.DateTimeField(
-        default=datetime.datetime.now,
         default=now,
         editable=False,
+    )
     speaker = models.ForeignKey("speakers.Speaker", related_name="proposals")
     additional_speakers = models.ManyToManyField("speakers.Speaker", through="AdditionalSpeaker", blank=True)
     cancelled = models.BooleanField(default=False)
@@ ... / @@ -163,13 +161,13 @@ def uuid_filename(instance, filename): @@
 class SupportingDocument(models.Model):
     proposal = models.ForeignKey(ProposalBase, related_name="supporting_documents")
     uploaded_by = models.ForeignKey(User)
-    created_at = models.DateTimeField(default=datetime.datetime.now)
     created_at = models.DateTimeField(default=now)
     file = models.FileField(upload_to=uuid_filename)
     description = models.CharField(max_length=140)
     def download_url(self):
         return reverse("proposal_document_download", args=[self.pk, os.path.basename(self.file.name).lower()])

symposion/proposals/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 urlpatterns = patterns("symposion.proposals.views",
     url(r"^submit/$", "proposal_submit", name="proposal_submit"),
     url(r"^submit/([\w\-]+)/$", "proposal_submit_kind", name="proposal_submit_kind"),
     url(r"^(\d+)/$", "proposal_detail", name="proposal_detail"),

symposion/proposals/views.py

➞

Show inline comments

@@ ... / @@ -3,13 +3,18 @@ import sys @@
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.hashcompat import sha_constructor
 try:
     from hashlib import sha1 as sha_constructor
 except ImportError:
     from django.utils.hashcompat import sha_constructor
 from django.views import static
 from django.contrib import messages
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required

symposion/reviews/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import patterns, url
 from django.conf.urls import patterns, url
 urlpatterns = patterns("symposion.reviews.views",
     url(r"^section/(?P<section_slug>[\w\-]+)/all/$", "review_section", {"reviewed": "all"}, name="review_section"),
     url(r"^section/(?P<section_slug>[\w\-]+)/reviewed/$", "review_section", {"reviewed": "reviewed"}, name="user_reviewed"),
     url(r"^section/(?P<section_slug>[\w\-]+)/not_reviewed/$", "review_section", {"reviewed": "not_reviewed"}, name="user_not_reviewed"),

symposion/schedule/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import url, patterns
 from django.conf.urls import url, patterns
 urlpatterns = patterns("symposion.schedule.views",
     url(r"^$", "schedule_conference", name="schedule_conference"),
     url(r"^edit/$", "schedule_edit", name="schedule_edit"),
     url(r"^list/$", "schedule_list", name="schedule_list"),

symposion/speakers/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 urlpatterns = patterns("symposion.speakers.views",
     url(r"^create/$", "speaker_create", name="speaker_create"),
     url(r"^create/(\w+)/$", "speaker_create_token", name="speaker_create_token"),
     url(r"^edit/(?:(?P<pk>\d+)/)?$", "speaker_edit", name="speaker_edit"),

symposion/sponsorship/urls.py

➞

Show inline comments

 from django.conf.urls.defaults import patterns, url
 from django.views.generic.simple import direct_to_template
 from django.conf.urls import patterns, url
 from django.views.generic import TemplateView
 urlpatterns = patterns("symposion.sponsorship.views",
-    url(r"^$", direct_to_template, {"template": "sponsorship/list.html"}, name="sponsor_list"),
+    url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), name="sponsor_list"),
     url(r"^apply/$", "sponsor_apply", name="sponsor_apply"),
     url(r"^add/$", "sponsor_add", name="sponsor_add"),
     url(r"^(?P<pk>\d+)/$", "sponsor_detail", name="sponsor_detail"),
+)

symposion/teams/urls.py

➞

Show inline comments

-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 urlpatterns = patterns("symposion.teams.views",
     # team specific
     url(r"^(?P<slug>[\w\-]+)/$", "team_detail", name="team_detail"),
     url(r"^(?P<slug>[\w\-]+)/join/$", "team_join", name="team_join"),

0 comments (0 inline, 0 general)