Merge pull request #49 from awgreenblatt/master

Check for password_field is not None before attempting to set its hel…
ctxis · Aug 16, 2018 · 4089d78 · 4089d78
2 parents eabde31 + c3afbd1
commit 4089d78
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/admin_view_permission/admin.py b/admin_view_permission/admin.py
@@ -363,15 +363,15 @@ def get_form(self, request, obj=None, **kwargs):
         else:
             password_field = None
 
-        # TODO: I don't like this at all. Find another way to change the
-        # TODO: help_text
-        if not self._has_change_only_permission(request):
-            password_field.help_text = _(
-                "Raw passwords are not stored, so there is no way to see this "
-                "user's password."
-            )
-        else:
-            if password_field:
+        if password_field:
+            # TODO: I don't like this at all. Find another way to change the
+            # TODO: help_text
+            if not self._has_change_only_permission(request):
+                password_field.help_text = _(
+                    "Raw passwords are not stored, so there is no way to "
+                    "see this user's password."
+                )
+            else:
                 password_field.help_text = _(
                     "Raw passwords are not stored, so there is no way to see "
                     "this user's password, but you can change the password "