Anpassungen des Codes an Django 1.11 mit Python 3

Grapelli wurde entfernt, das neue Django Admin ist hübsch genug.
This commit is contained in:
2017-05-10 10:15:39 +02:00
parent 5437b7b8de
commit 321531c160
25 changed files with 219 additions and 121 deletions

View File

@@ -1,10 +1,9 @@
# -*- encoding: utf-8 -*-
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import *
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^$', EventGallery.as_view(), name='event-gallery'),
url(r'^(?P<event>[\d]+)/$', EventPhotoList.as_view(),
name='event-photo-list'),
@@ -15,4 +14,4 @@ urlpatterns = patterns(
url(r'^delete/(?P<pk>[\d]+)/$', DeleteEventPhoto.as_view(),
name='delete-event-photo'),
url(r'^upload/$', EventPhotoUpload.as_view(), name='event-photo-upload'),
)
]

View File

@@ -135,7 +135,7 @@ class Event(models.Model):
verbose_name_plural = _('Events')
ordering = ('start', 'end',)
def __unicode__(self):
def __str__(self):
try:
return "%(name)s (%(date)s)" % {'name': self.name,
'date': self.start.date()}
@@ -235,7 +235,7 @@ class Location(models.Model):
verbose_name = _('Venue')
verbose_name_plural = _('Venues')
def __unicode__(self):
def __str__(self):
return self.name
@property
@@ -306,7 +306,7 @@ class Photo(models.Model):
verbose_name = _('Event Image')
verbose_name_plural = _('Event Images')
def __unicode__(self):
def __str__(self):
return os.path.basename(self.image.name)
def rotate(self, rotate):

View File

@@ -1,10 +1,9 @@
# -*- encoding: utf-8 -*-
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.views.generic import RedirectView
from .views import *
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^$', RedirectView.as_view(url='/events/upcoming/', permanent=True)),
url(r'^(?P<year>[\d]{4})/$', EventArchiveYear.as_view(),
name='event-archive'),
@@ -19,4 +18,4 @@ urlpatterns = patterns(
url(r'^add/$', EventForm.as_view(), name='event-form'),
url(r'^archive/$', EventArchiveIndex.as_view(), name='event-archive'),
url(r'^upcoming/$', UpcomingEvents.as_view(), name='upcoming-events'),
)
]