Permalink
Browse files

- Beginning adding support for Django 1.3.

- Added test project.
- Making the settings less magic and fickle.
  • Loading branch information...
1 parent 5eab114 commit 767cf59aa8da8acdea941ef3af0ce5c187dd76ce @runekaagaard committed Nov 7, 2011
View
@@ -0,0 +1 @@
+*.pyc
View
@@ -13,6 +13,8 @@
from django.utils.formats import date_format
from django.conf import settings
+from filtrate import settings
+
class FiltrateFilter(FilterSpec):
"""
The base django_admin_filtrate filter. It requires overriding of
@@ -21,9 +23,9 @@ class FiltrateFilter(FilterSpec):
Requires the altered template for "filter.html".
"""
- def __init__(self, f, request, params, model, model_admin):
+ def __init__(self, f, request, params, model, model_admin, field_path=None):
super(FiltrateFilter, self).__init__(f, request, params, model,
- model_admin)
+ model_admin, field_path=None)
self._add_media(model_admin)
self.request = request
self.params = params
@@ -41,7 +43,7 @@ def _get_media(obj):
media = _get_media(model_admin) + _get_media(FiltrateFilter)\
+ _get_media(self)
-
+
for name in MEDIA_TYPES:
setattr(model_admin.Media, name, getattr(media, "_" + name))
@@ -124,7 +126,8 @@ def get_content(self):
return mark_safe(u"""
<script>
var filtrate = filtrate || {};
- filtrate.language_code = '%(language_code)s';
+ filtrate.datepicker_region = '%(datepicker_region)s';
+ filtrate.datepicker_date_format = '%(datepicker_date_format)s';
</script>
<form class="filtrate_daterange_form" method="get">
%(form)s
@@ -134,7 +137,8 @@ def get_content(self):
""" % ({
'form': form.as_p(),
'submit': _('Apply filter'),
- 'language_code': settings.LANGUAGE_CODE[:2],
+ 'datepicker_region': settings.FILTRATE['datepicker_region'],
+ 'datepicker_date_format': settings.FILTRATE['datepicker_date_format'],
'get_params': self._form_duplicate_getparams(form.fields.keys()),
}))
View
@@ -0,0 +1,13 @@
+from django.conf import settings
+
+FILTRATE = {
+ # See http://jqueryui.com/demos/datepicker/#localization.
+ 'datepicker_region': 'en-GB',
+ # See http://docs.jquery.com/UI/Datepicker/formatDate.
+ 'datepicker_date_format': 'yy-mm-dd',
+}
+
+try:
+ FILTRATE.update(settings.FILTRATE)
+except AttributeError:
+ pass
@@ -1,8 +1,10 @@
(function($, that) { $(function() {
if (!filtrate.is_active()
- || typeof that.filtrate.language_code === 'undefined') return;
- var regional = $.datepicker.regional[that.filtrate.language_code];
- regional['dateFormat'] = formats['DATE_FORMAT'];
+ || typeof that.filtrate.datepicker_region === 'undefined') return;
+
+ var regional = $.datepicker.regional[that.filtrate.datepicker_region];
+ regional['dateFormat'] = that.filtrate.datepicker_date_format;
+
$('input.filtrate_date').datepicker(regional);
$('input.filtrate_date').each(function() {
@@ -1,5 +1,7 @@
+if (typeof jQuery === 'undefined') jQuery = django.jQuery;
+
var filtrate = filtrate || {};
filtrate.is_active = function() {
- return $('#changelist-filter div.filtrate').length !== 0;
+ return jQuery('#changelist-filter div.filtrate').length !== 0;
}
No changes.
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+import imp
+try:
+ imp.find_module('settings') # Assumed to be in the same directory.
+except ImportError:
+ import sys
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
+ sys.exit(1)
+
+import settings
+
+if __name__ == "__main__":
+ execute_manager(settings)
@@ -0,0 +1,2 @@
+cp test_db_clean.sql test_db.sql
+./manage.py syncdb
@@ -0,0 +1,156 @@
+import os.path
+PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
+
+# Django settings for test_project project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+ # ('Your Name', 'your_email@example.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': 'test_db.sql', # Or path to database file if using sqlite3.
+ 'USER': '', # Not used with sqlite3.
+ 'PASSWORD': '', # Not used with sqlite3.
+ 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ }
+}
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = ''
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# URL prefix for admin static files -- CSS, JavaScript and images.
+# Make sure to use a trailing slash.
+# Examples: "http://foo.com/static/admin/", "/static/admin/".
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+ # Put strings here, like "/home/html/static" or "C:/www/django/static".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '3w%#ag@h#7_*-%wbht@!id5pgm^$n(hs^ws=xb#*v*uf^^o_9p'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+# 'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.csrf.CsrfViewMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
+)
+
+ROOT_URLCONF = 'test_project.urls'
+
+TEMPLATE_DIRS = (
+ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ os.path.join(PROJECT_ROOT, 'templates'),
+)
+
+INSTALLED_APPS = (
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+ # Uncomment the next line to enable the admin:
+ 'django.contrib.admin',
+ # Uncomment the next line to enable admin documentation:
+ 'django.contrib.admindocs',
+ 'filtrate',
+ 'test_app',
+)
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'handlers': {
+ 'mail_admins': {
+ 'level': 'ERROR',
+ 'class': 'django.utils.log.AdminEmailHandler'
+ }
+ },
+ 'loggers': {
+ 'django.request': {
+ 'handlers': ['mail_admins'],
+ 'level': 'ERROR',
+ 'propagate': True,
+ },
+ }
+}
+
+FILTRATE = {
+ 'datepicker_region': 'da',
+ 'datepicker_date_format': 'D, d M yy',
+}
No changes.
@@ -0,0 +1,11 @@
+from django.contrib import admin
+from test_app.models import Case
+
+class CaseAdmin(admin.ModelAdmin):
+ list_filter = ['start_date']
+
+ class Media():
+ js = ()
+ css = {}
+
+admin.site.register(Case, CaseAdmin)
@@ -0,0 +1,14 @@
+from django.db import models
+
+from filtrate import register_filter
+from filtrate.filters import DateRangeFilter
+
+class CaseDateRangeFilter(DateRangeFilter):
+ field_name = 'start_date'
+
+ def get_title(self):
+ return "By case start date"
+
+class Case(models.Model):
+ start_date = models.DateField()
+ register_filter(start_date, CaseDateRangeFilter)
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+ def test_basic_addition(self):
+ """
+ Tests that 1 + 1 always equals 2.
+ """
+ self.assertEqual(1 + 1, 2)
@@ -0,0 +1 @@
+# Create your views here.
Binary file not shown.
Binary file not shown.
View
@@ -0,0 +1,17 @@
+from django.conf.urls.defaults import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+ # Examples:
+ # url(r'^$', 'test_project.views.home', name='home'),
+ # url(r'^test_project/', include('test_project.foo.urls')),
+
+ # Uncomment the admin/doc line below to enable admin documentation:
+ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+ # Uncomment the next line to enable the admin:
+ url(r'^admin/', include(admin.site.urls)),
+)

0 comments on commit 767cf59

Please sign in to comment.