diff options
| author | Christopher Long <indirecthit@gmail.com> | 2006-08-14 23:19:52 +0000 |
|---|---|---|
| committer | Christopher Long <indirecthit@gmail.com> | 2006-08-14 23:19:52 +0000 |
| commit | 77eda0234e59ad009b5922d770e8b10a4125e80e (patch) | |
| tree | 6af106b0736cc46a38e962f4045dda8ccf0fe18d | |
| parent | dc3c4db1141b1c38c2a7a40b14924f6a0a1ac565 (diff) | |
[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
| -rw-r--r-- | django/contrib/admin/row_level_perm_manipulator.py | 1 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/row_level_permission.html | 8 |
2 files changed, 4 insertions, 5 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 @@ <h2>{% trans "Current Permissions" %}</h2> <table id="current-rlpTable"> +{% if rlp_form_list %} <tr class="header"> <th id="select_header"></th> <th id="owner_header"> @@ -65,7 +66,6 @@ </th> </tr> <TBODY> -{% if rlp_form_list %} {% load row_level_permission %} {% for o in rlp_form_list %} <tr id="editRLP-{{ o.rlp.id }}"> @@ -106,8 +106,8 @@ </form> </td> </tr> +</TBODY> +</table> {% else %} -<tr><td colspan=4><em>No row level permissions</em></td></tr> +<em>{% trans 'No row level permissions'%}</em> {% endif %} -</TBODY> -</table>
\ No newline at end of file |