From 4d388c946e2ced7258c032208712d11814d1e50f Mon Sep 17 00:00:00 2001
From: Matias Aguirre <matiasaguirre@gmail.com>
Date: Fri, 19 Sep 2008 19:17:41 +0000
Subject: [PATCH] Django 1.0 support over download application

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40263
---
 sites/scrapy.org/scrapyorg/download/admin.py  | 11 +++++++++++
 sites/scrapy.org/scrapyorg/download/models.py | 15 +++++++--------
 sites/scrapy.org/scrapyorg/urls.py            | 19 ++++++++++++-------
 3 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 sites/scrapy.org/scrapyorg/download/admin.py

diff --git a/sites/scrapy.org/scrapyorg/download/admin.py b/sites/scrapy.org/scrapyorg/download/admin.py
new file mode 100644
index 000000000..4c5880561
--- /dev/null
+++ b/sites/scrapy.org/scrapyorg/download/admin.py
@@ -0,0 +1,11 @@
+from django.contrib import admin
+
+from scrapyorg.download.models import DownloadLink
+
+
+class DownloadLinkAdmin(admin.ModelAdmin):
+    list_display = ("text", "address", "public_link", "created")
+    list_filter = ("public", "created")
+    search_fields = ("address", "text")
+
+admin.site.register(DownloadLink, DownloadLinkAdmin)
diff --git a/sites/scrapy.org/scrapyorg/download/models.py b/sites/scrapy.org/scrapyorg/download/models.py
index ed2672873..95e62d7a4 100644
--- a/sites/scrapy.org/scrapyorg/download/models.py
+++ b/sites/scrapy.org/scrapyorg/download/models.py
@@ -10,12 +10,11 @@ class DownloadLink(models.Model):
     address = models.CharField(_("address"), max_length=1024, blank=False)
     text = models.CharField(_("link text"), max_length=512, blank=False,
                             default=_("download"))
-    public = models.BooleanField(_("public"), core=True, blank=False,
-                                 default=True)
+    public = models.BooleanField(_("public"), blank=False, default=True)
 
     # automatic dates
-    created = models.DateTimeField(_("created"), core=True, editable=False)
-    updated = models.DateTimeField(_("updated"), core=True, editable=False)
+    created = models.DateTimeField(_("created"), editable=False)
+    updated = models.DateTimeField(_("updated"), editable=False)
 
     def toggle_public(self):
         self.public = not self.public
@@ -41,10 +40,10 @@ class DownloadLink(models.Model):
     public_link.short_description = u"public"
     public_link.allow_tags = True
 
-    class Admin:
-        list_display = ("text", "address", "public_link", "created")
-        list_filter = ("public", "created")
-        save_on_top = True
+#     class Admin:
+#         list_display = ("text", "address", "public_link", "created")
+#         list_filter = ("public", "created")
+#         save_on_top = True
 
     class Meta:
         verbose_name = _("download link")
diff --git a/sites/scrapy.org/scrapyorg/urls.py b/sites/scrapy.org/scrapyorg/urls.py
index 87ac50b54..aa78579b2 100644
--- a/sites/scrapy.org/scrapyorg/urls.py
+++ b/sites/scrapy.org/scrapyorg/urls.py
@@ -1,23 +1,28 @@
-from django.conf.urls.defaults import *
-from django.views.generic.simple import direct_to_template
 from django.conf import settings
+from django.conf.urls.defaults import *
+from django.contrib import admin
+
+
+admin.autodiscover()
 
 
 urlpatterns = patterns('',
-    (r"^weblog/", include("scrapyorg.blog.urls")),
+    url(r"^weblog/", include("scrapyorg.blog.urls")),
 
     # admin
-    (r"^admin/download/downloadlink/", include("scrapyorg.download.urls")),
-    (r"^admin/", include("django.contrib.admin.urls")),
+    url(r"^admin/download/downloadlink/", include("scrapyorg.download.urls")),
+    url(r'^admin/(.*)', admin.site.root),
 )
 
 
 if settings.DEBUG: # devel
     urlpatterns += patterns('',         
-        (r'^%s/(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+        (r'^%s/(?P<path>.*)$' % settings.MEDIA_URL[1:],
+          'django.views.static.serve',
+          {'document_root': settings.MEDIA_ROOT}),
     )
     
 # last resort, it's an article
 urlpatterns += patterns('',         
-    (r"", include("scrapyorg.article.urls")),
+    url(r"", include("scrapyorg.article.urls")),
 )