From 829519e26be0284dc021f5d30615eee270118f70 Mon Sep 17 00:00:00 2001 From: Patrick Altman Date: Thu, 1 Nov 2012 08:08:33 -0500 Subject: [PATCH] Fixed a couple of bugs --- dialogos/authorization.py | 2 +- dialogos/forms.py | 4 ++-- requirements/development.txt | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 requirements/development.txt diff --git a/dialogos/authorization.py b/dialogos/authorization.py index 5ec98b9..bef5297 100644 --- a/dialogos/authorization.py +++ b/dialogos/authorization.py @@ -21,7 +21,7 @@ def load_path_attr(path): def default_can_delete(user, comment): - if user.is_superuser(): + if user.is_superuser: return True return user == comment.author diff --git a/dialogos/forms.py b/dialogos/forms.py index 2f149db..799f9dd 100644 --- a/dialogos/forms.py +++ b/dialogos/forms.py @@ -18,7 +18,7 @@ def __init__(self, *args, **kwargs): self.obj = kwargs.pop("obj") self.user = kwargs.pop("user") super(CommentForm, self).__init__(*args, **kwargs) - if self.user is not None: + if self.user is not None and not self.user.is_anonymous(): del self.fields["name"] del self.fields["email"] del self.fields["website"] @@ -28,7 +28,7 @@ def save(self, commit=True): comment.ip_address = self.request.META.get("REMOTE_ADDR", None) comment.content_type = ContentType.objects.get_for_model(self.obj) comment.object_id = self.obj.pk - if self.user is not None: + if self.user is not None and not self.user.is_anonymous(): comment.author = self.user if commit: comment.save() diff --git a/requirements/development.txt b/requirements/development.txt deleted file mode 100644 index 3388c50..0000000 --- a/requirements/development.txt +++ /dev/null @@ -1,3 +0,0 @@ -Django==1.2.1 --e git+ssh://git@git.eldarion.com:1382/eldarion.git#egg=eldarion -