From b5cbbf58c03d79b912a076658f3ae0997fcb1dbe Mon Sep 17 00:00:00 2001 From: Christopher Long Date: Sat, 19 Aug 2006 17:53:48 +0000 Subject: [PATCH] [per-object-permissions] Added "Edit Row Level Permissions" link on change_form if object has row level permissions enabled [per-object-permissions] Modified the row level permissions edit page so the URL is based off of the object instead of being part of the auth git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3616 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin/templates/admin/change_form.html | 1 + .../templates/admin/row_level_permission.html | 30 +++--- django/contrib/admin/urls.py | 5 +- django/contrib/admin/views/main.py | 1 + .../admin/views/row_level_permissions.py | 94 ++++++++++++++----- 5 files changed, 92 insertions(+), 39 deletions(-) diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 3f43ae7812..b70c9e3bae 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -18,6 +18,7 @@ {% block content %}
{% if change %}{% if not is_popup %} {% endif %}{% endif %} diff --git a/django/contrib/admin/templates/admin/row_level_permission.html b/django/contrib/admin/templates/admin/row_level_permission.html index bc4956a464..354108d66e 100644 --- a/django/contrib/admin/templates/admin/row_level_permission.html +++ b/django/contrib/admin/templates/admin/row_level_permission.html @@ -17,8 +17,9 @@ {{ title|escape }}
{% endblock %} -{% block content %}
-
+{% block content %} + +
{% if_has_perm "auth.add_rowlevelpermission" %}

{% trans "Add Permissions" %}

@@ -66,7 +67,7 @@ {% if_has_perm "auth.change_rowlevelpermission" %}

{% trans "Current Permissions" %}

-{% if rlp_form_list %} +{% if rlp_forms %} {% load row_level_permission %} -{% for o in rlp_form_list %} +{% for x in rlp_forms %} + + + +{% for o in x.1 %} - +
@@ -84,10 +85,16 @@
+{{ x.0 }} +
@@ -107,7 +114,8 @@
- {% trans 'Delete' %} | + + {% trans 'Delete' %} | {% trans 'Copy to New' %}