richleland / django-happening

a collection of news and events focused django apps.

commit 47: 5e5b69a2d29b
parent 46: 252735f73a87
branch: default
Set events to use object_list generic view instead of date_based archive.
Rich Leland / richleland
7 months ago

Changed (Δ1012 bytes):

raw changeset »

happening/__init__.py (2 lines added, 0 lines removed)

happening/events/models.py (1 lines added, 1 lines removed)

happening/events/urls.py (4 lines added, 32 lines removed)

Up to file-list happening/__init__.py:

1
VERSION = (0, 1)
2
__version__ = '.'.join(map(str, VERSION))

Up to file-list happening/events/models.py:

@@ -23,7 +23,7 @@ class Event(models.Model):
23
23
    "Represents an event in time."
24
24
    visible = models.BooleanField(default=True)
25
25
    featured = models.BooleanField(default=True)
26
    pub_date = models.DateTimeField(default=datetime.now)
26
    pub_date = models.DateTimeField(_("event date"), default=datetime.now)
27
27
    event_type = models.ForeignKey(EventType)
28
28
    title = models.CharField(max_length=255)
29
29
    slug = models.SlugField()

Up to file-list happening/events/urls.py:

@@ -2,9 +2,9 @@ from django.conf.urls.defaults import *
2
2
3
3
from happening.events.models import EventType, Event
4
4
5
urlpatterns = patterns('django.views.generic.date_based',
5
urlpatterns = patterns('',
6
6
    url(r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<slug>[-\w]+)/$',
7
        'object_detail', {
7
        'django.views.generic.date_based.object_detail', {
8
8
            'queryset': Event.objects.live().order_by('pub_date'),
9
9
            'date_field': 'pub_date',
10
10
            'slug_field': 'slug',
@@ -14,38 +14,10 @@ urlpatterns = patterns('django.views.gen
14
14
            'allow_future': True,
15
15
        }, name='events-detail'),
16
16
17
    url(r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$',
18
        'archive_day', {
19
            'queryset': Event.objects.live().order_by('pub_date'),
20
            'date_field': 'pub_date',
21
            'month_format': '%m',
22
            'day_format': '%d',
23
            'template_object_name': 'event',
24
            'allow_future': True,
25
        },name='events-day'),
26
27
    url(r'^(?P<year>\d{4})/(?P<month>\d{2})/$',
28
        'archive_month', {
29
            'queryset': Event.objects.live().order_by('pub_date'),
30
            'date_field': 'pub_date',
31
            'month_format': '%m',
32
            'template_object_name': 'event',
33
            'allow_future': True,
34
        }, name='events-month'),
35
36
    url(r'^(?P<year>\d{4})/$',
37
        'archive_year', {
38
            'queryset': Event.objects.live().order_by('pub_date'),
39
            'date_field': 'pub_date',
40
            'allow_future': True,
41
        }, name='events-year'),
42
43
17
    url(r'^$',
44
        'archive_index', {
45
            'queryset': Event.objects.live().order_by('pub_date'),
46
            'date_field': 'pub_date',
18
        'django.views.generic.list_detail.object_list', {
19
            'queryset': Event.objects.live().select_related('event_type').order_by('pub_date'),
47
20
            'template_object_name': 'events',
48
21
            'extra_context': { 'event_types': EventType.objects.live },
49
            'allow_future': True,
50
22
        }, name='events-index'),
51
23
)