summaryrefslogtreecommitdiffstats
path: root/forum
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-22 23:02:11 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-22 23:02:11 -0500
commitd18148e7fe39fed1e5f46f4d65af83229ed009bb (patch)
treef629303c98761ad5ea1830abfbe8af7e7eda49bb /forum
parent2390d0191c52ae585cda3f1ae6f884cc58639025 (diff)
parent7b447646ba1867c67edaa1c2df0074f0d6d05b2c (diff)
downloadaskbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.tar.gz
askbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.tar.bz2
askbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.zip
merged joseph's branch
Diffstat (limited to 'forum')
-rw-r--r--forum/admin.py1
-rw-r--r--forum/forms.py1
-rw-r--r--forum/management/commands/send_email_alerts.py1
3 files changed, 0 insertions, 3 deletions
diff --git a/forum/admin.py b/forum/admin.py
index 9d81450a..3afa2241 100644
--- a/forum/admin.py
+++ b/forum/admin.py
@@ -3,7 +3,6 @@
from django.contrib import admin
from models import *
-
class AnonymousQuestionAdmin(admin.ModelAdmin):
"""AnonymousQuestion admin class"""
diff --git a/forum/forms.py b/forum/forms.py
index 5d70fcff..f22763f7 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -182,7 +182,6 @@ class EditQuestionForm(forms.Form):
tags = TagNamesField()
summary = SummaryField()
-
def __init__(self, question, revision, *args, **kwargs):
super(EditQuestionForm, self).__init__(*args, **kwargs)
self.fields['title'].initial = revision.title
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index db6c00ac..ab318e50 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -57,7 +57,6 @@ class Command(NoArgsCommand):
q_ans = Q_set.filter(answers__author=user)
q_ans.cutoff_time = cutoff_time
elif feed.feed_type == 'q_all':
-
if user.tag_filter_setting == 'ignored':
ignored_tags = Tag.objects.filter(user_selections__reason='bad',user_selections__user=user)
q_all = Q_set.exclude( tags__in=ignored_tags )