Skip to content
This repository has been archived by the owner on Feb 1, 2019. It is now read-only.

Commit

Permalink
Temp. fix for django >= 1.6 & hvad issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jmelett committed Nov 20, 2014
1 parent e5fa366 commit 6d7c237
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion aldryn_events/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
__version__ = '0.7.15'

This comment has been minimized.

Copy link
@czpython

czpython Nov 26, 2014

Contributor

@jmelett please do version bumps in a separate commit

__version__ = '0.7.16'
request_events_event_identifier = 'aldryn_events_current_event'
5 changes: 4 additions & 1 deletion aldryn_events/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import django
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _

Expand All @@ -22,7 +23,9 @@ class EventAdmin(FrontendEditableAdmin, TranslatableAdmin, PlaceholderAdmin):
list_editable = ('is_published',)
list_filter = ('is_published',)
filter_horizontal = ('event_coordinators', )
date_hierarchy = 'start_date'
if not django.VERSION >= (1, 6):
# Django >= 1.6 calls aggregate on queryset, which is currently not implemented in django-hvad
date_hierarchy = 'start_date'
frontend_editable_fields = ('title', 'short_description', 'location')

prepopulated_fields = {"slug": ("slug",)} # needed so that django loads the needed JS
Expand Down

0 comments on commit 6d7c237

Please sign in to comment.