savannah-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 4


From: Sylvain Beucler
Subject: [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 4787358ff0ec0238ac17df34700936926518f3ee
Date: Fri, 14 May 2010 20:17:13 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  4787358ff0ec0238ac17df34700936926518f3ee (commit)
      from  a2d99a3bf6228450f04256dd3fc89f29fdeec2be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=4787358ff0ec0238ac17df34700936926518f3ee

commit 4787358ff0ec0238ac17df34700936926518f3ee
Author: Sylvain Beucler <address@hidden>
Date:   Fri May 14 22:17:03 2010 +0200

    More notes on Django 1.2

diff --git a/doc/DJANGO b/doc/DJANGO
index b60f492..e64ca87 100644
--- a/doc/DJANGO
+++ b/doc/DJANGO
@@ -19,3 +19,8 @@ Stuff of interest:
   "get_object_or_404(ExtendedUser, pk=request.user.pk)" calls with
   something that actually creates the ExtendedUser if the user is just
   a basic user.
+
+- In Django 1.2, the combination of aggregation and filters is buggy,
+  and voluntarily released that way without so much of a release note.
+  Don't rely on it.
+  http://code.djangoproject.com/ticket/11293
diff --git a/urls.py b/urls.py
index 122b986..5536d12 100644
--- a/urls.py
+++ b/urls.py
@@ -20,8 +20,10 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 
+urlpatterns = patterns('',)
+
 # Home/presentation pages
-urlpatterns = patterns('',
+urlpatterns += patterns('',
   (r'', include('savane.svmain.urls')),
 )
 
@@ -44,14 +46,14 @@ from django.contrib import admin
 import django
 admin.autodiscover()
 
-if django.VERSION[0] > 1 or (django.VERSION[0] == 1 and django.VERSION[1] >= 
1):
-    urlpatterns += patterns('',
-      (r'^admin/', include(admin.site.urls)),
-    )
-else:
-    urlpatterns += patterns('',
-      (r'^admin/(.*)', admin.site.root),
-    )
+urlpatterns += patterns('',
+    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
+    # to INSTALLED_APPS to enable admin documentation:
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    (r'^admin/', include(admin.site.urls)),
+)
 
 
 # Static content

-----------------------------------------------------------------------

Summary of changes:
 doc/DJANGO |    5 +++++
 urls.py    |   20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework



reply via email to

[Prev in Thread] Current Thread [Next in Thread]