From baee62cf44d0483e560160939b944e810a431e6b Mon Sep 17 00:00:00 2001
From: Matias Aguirre <matiasaguirre@gmail.com>
Date: Fri, 25 Jul 2008 15:38:11 +0000
Subject: [PATCH] Change positions urls in download and article applications,
 this are like admin urls now and the views are decorated to force a staff
 user check before

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40112
---
 sites/scrapy.org/scrapyorg/article/models.py  | 4 ++--
 sites/scrapy.org/scrapyorg/article/views.py   | 4 +++-
 sites/scrapy.org/scrapyorg/download/models.py | 5 ++---
 sites/scrapy.org/scrapyorg/download/urls.py   | 2 +-
 sites/scrapy.org/scrapyorg/download/views.py  | 2 ++
 sites/scrapy.org/scrapyorg/urls.py            | 4 +++-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sites/scrapy.org/scrapyorg/article/models.py b/sites/scrapy.org/scrapyorg/article/models.py
index 9eb34a372..fd73b660f 100644
--- a/sites/scrapy.org/scrapyorg/article/models.py
+++ b/sites/scrapy.org/scrapyorg/article/models.py
@@ -49,8 +49,8 @@ class Article(models.Model):
     
     # ugly, but django-admin isn't very versatile right now
     def position_link(self):
-        return _("%(position)s (<a href='/article/%(id)s/position/up/'>Up</a>" \
-               " | <a href='/article/%(id)s/position/down/'>Down</a>)") % \
+        return _("%(position)s (<a href='/admin/article/article/%(id)s/position/up/'>Up</a>" \
+                 " | <a href='/admin/article/article/%(id)s/position/down/'>Down</a>)") % \
                { "position": self.position, "id": self.id }
     position_link.short_description = u"position"
     position_link.allow_tags = True
diff --git a/sites/scrapy.org/scrapyorg/article/views.py b/sites/scrapy.org/scrapyorg/article/views.py
index 736650404..e461e2345 100644
--- a/sites/scrapy.org/scrapyorg/article/views.py
+++ b/sites/scrapy.org/scrapyorg/article/views.py
@@ -1,15 +1,17 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
+from django.contrib.admin.views.decorators import staff_member_required
 
 from scrapyorg.article.models import Article
 
 
+@staff_member_required
 def position_up(request, article_id):
     article = get_object_or_404(Article, pk=article_id)
     article.position_up()
     return HttpResponseRedirect("/admin/article/article/")
 
-
+@staff_member_required
 def position_down(request, article_id):
     article = get_object_or_404(Article, pk=article_id)
     article.position_down()
diff --git a/sites/scrapy.org/scrapyorg/download/models.py b/sites/scrapy.org/scrapyorg/download/models.py
index 97102eb9b..6ca684699 100644
--- a/sites/scrapy.org/scrapyorg/download/models.py
+++ b/sites/scrapy.org/scrapyorg/download/models.py
@@ -32,9 +32,8 @@ class DownloadLink(models.Model):
 
     # ugly, but django-admin isn't very versatile right now
     def public_link(self):
-        return _("%(status)s (<a href='/download/%(id)s/public/toggle/'>toggle</a>)") % \
-               { 'status': self.public and _("Yes") or _("No"),
-                 'id': self.id }
+        return _("%s (<a href='%s/toggle/'>toggle</a>)") % \
+               (self.public and _("Yes") or _("No"), self.id )
     public_link.short_description = u"public"
     public_link.allow_tags = True
 
diff --git a/sites/scrapy.org/scrapyorg/download/urls.py b/sites/scrapy.org/scrapyorg/download/urls.py
index e8d1e4700..59deb47f4 100644
--- a/sites/scrapy.org/scrapyorg/download/urls.py
+++ b/sites/scrapy.org/scrapyorg/download/urls.py
@@ -4,5 +4,5 @@ from scrapyorg.download.views import *
 
 
 urlpatterns = patterns('',
-    (r"^(?P<link_id>\d+)/public/toggle/$", toggle_public),
+    (r"^(?P<link_id>\d+)/toggle/$", toggle_public),
 )
diff --git a/sites/scrapy.org/scrapyorg/download/views.py b/sites/scrapy.org/scrapyorg/download/views.py
index f0b6ae097..bc4b56215 100644
--- a/sites/scrapy.org/scrapyorg/download/views.py
+++ b/sites/scrapy.org/scrapyorg/download/views.py
@@ -1,9 +1,11 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
+from django.contrib.admin.views.decorators import staff_member_required
 
 from scrapyorg.download.models import DownloadLink
 
 
+@staff_member_required
 def toggle_public(request, link_id):
     link = get_object_or_404(DownloadLink, pk=link_id)
     link.toggle_public()
diff --git a/sites/scrapy.org/scrapyorg/urls.py b/sites/scrapy.org/scrapyorg/urls.py
index 3cfe2d689..97316b1a0 100644
--- a/sites/scrapy.org/scrapyorg/urls.py
+++ b/sites/scrapy.org/scrapyorg/urls.py
@@ -6,9 +6,11 @@ from django.conf import settings
 urlpatterns = patterns('',
     (r"^$", direct_to_template, { "template": "home.html" }),
     (r"^article/", include("scrapyorg.article.urls")),
-    (r"^download/", include("scrapyorg.download.urls")),
     (r"^weblog/", include("scrapyorg.blog.urls")),
 
+    # admin
+    (r"^admin/article/article/", include("scrapyorg.article.urls")),
+    (r"^admin/download/downloadlink/", include("scrapyorg.download.urls")),
     (r"^admin/", include("django.contrib.admin.urls")),
 )