From 77eda0234e59ad009b5922d770e8b10a4125e80e Mon Sep 17 00:00:00 2001 From: Christopher Long Date: Mon, 14 Aug 2006 23:19:52 +0000 Subject: [PATCH] [per-object-permissions] Corrected incorrect import in row_level_perm_manipulator and made some format changes to the row level perm template git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3586 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/row_level_perm_manipulator.py | 1 - .../admin/templates/admin/row_level_permission.html | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/django/contrib/admin/row_level_perm_manipulator.py b/django/contrib/admin/row_level_perm_manipulator.py index b3a79dcfdc..8101ee260c 100644 --- a/django/contrib/admin/row_level_perm_manipulator.py +++ b/django/contrib/admin/row_level_perm_manipulator.py @@ -3,7 +3,6 @@ from django.contrib.contenttypes.models import ContentType from django.http import Http404, HttpResponse, HttpResponseRedirect from django.contrib.auth.models import User, Group, Permission, RowLevelPermission from django.db.models import manipulators -from auth import utils class ChangeRLPManipulator(forms.Manipulator): def __init__(self, ct=None): diff --git a/django/contrib/admin/templates/admin/row_level_permission.html b/django/contrib/admin/templates/admin/row_level_permission.html index 412a5da869..422ad403e7 100644 --- a/django/contrib/admin/templates/admin/row_level_permission.html +++ b/django/contrib/admin/templates/admin/row_level_permission.html @@ -49,6 +49,7 @@

{% trans "Current Permissions" %}

+{% if rlp_form_list %} -{% if rlp_form_list %} {% load row_level_permission %} {% for o in rlp_form_list %} @@ -106,8 +106,8 @@ -{% else %} - -{% endif %} -
@@ -65,7 +66,6 @@
No row level permissions
\ No newline at end of file + +{% else %} +{% trans 'No row level permissions'%} +{% endif %}