update to revidion 54 in svn

Author: hrc

.idea/workspace.xml

@@ -1,50 +1,41 @@
 import datetime
 from django.db.models.signals import post_save
 from forum.models import *
-from forum.models.base import marked_deleted
-from forum.models.meta import vote_canceled
+from forum.models.base import marked_deleted, mark_canceled
+from forum.models.node import node_create
+from forum.models.answer import answer_accepted
 from forum.authentication import user_updated
 from forum.const import *
 
-def record_ask_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
-        activity.save()
-
-post_save.connect(record_ask_event, sender=Question)
-
-
-def record_answer_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
-        activity.save()
+def record_ask_event(instance, **kwargs):
+    activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
+    activity.save()
 
-post_save.connect(record_answer_event, sender=Answer)
+node_create.connect(record_ask_event, sender=Question)
 
 
-def record_comment_event(instance, created, **kwargs):
-    if created:
-        act_type = (instance.content_object.__class__ is Question) and TYPE_ACTIVITY_COMMENT_QUESTION or TYPE_ACTIVITY_COMMENT_ANSWER
-        activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=act_type)
-        activity.save()
+def record_answer_event(instance, **kwargs):
+    activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
+    activity.save()
 
-post_save.connect(record_comment_event, sender=Comment)
+node_create.connect(record_answer_event, sender=Answer)
 
 
-def record_question_revision_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_QUESTION)
-        activity.save()
+def record_comment_event(instance, **kwargs):
+    act_type = (instance.content_object.__class__ is Question) and TYPE_ACTIVITY_COMMENT_QUESTION or TYPE_ACTIVITY_COMMENT_ANSWER
+    activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=act_type)
+    activity.save()
 
-post_save.connect(record_question_revision_event, sender=QuestionRevision)
+node_create.connect(record_comment_event, sender=Comment)
 
 
-def record_answer_revision_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_ANSWER)
+def record_revision_event(instance, created, **kwargs):
+    if created and instance.revision <> 1 and instance.node.node_type in ('question', 'answer',):
+        activity_type = instance.node.node_type == 'question' and TYPE_ACTIVITY_UPDATE_QUESTION or TYPE_ACTIVITY_UPDATE_ANSWER
+        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=activity_type)
         activity.save()
 
-post_save.connect(record_answer_revision_event, sender=AnswerRevision)
+post_save.connect(record_revision_event, sender=NodeRevision)
 
 
 def record_award_event(instance, created, **kwargs):
@@ -56,13 +47,11 @@ def record_award_event(instance, created, **kwargs):
 post_save.connect(record_award_event, sender=Award)
 
 
-def record_answer_accepted(instance, created, **kwargs):
-    if not created and 'accepted' in instance.get_dirty_fields() and instance.accepted:
-        activity = Activity(user=instance.question.author, active_at=datetime.datetime.now(), \
-            content_object=instance, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
-        activity.save()
+def record_answer_accepted(answer, user, **kwargs):
+    activity = Activity(user=user, active_at=datetime.datetime.now(), content_object=answer, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
+    activity.save()
 
-post_save.connect(record_answer_accepted, sender=Answer)
+answer_accepted.connect(record_answer_accepted)
 
 
 def update_last_seen(instance, **kwargs):
@@ -88,7 +77,7 @@ def record_cancel_vote(instance, **kwargs):
     activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=act_type)
     activity.save()
 
-vote_canceled.connect(record_cancel_vote)
+mark_canceled.connect(record_cancel_vote, sender=Vote)
 
 
 def record_delete_post(instance, **kwargs):

forum/activity.py

@@ -36,23 +36,23 @@ def consumer(self):
 user_logged_in = django.dispatch.Signal(providing_args=["user", "old_session"])
 user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
 
-def post_stored_anonymous_content(user,old_session,**kwargs):
-    from forum.models import AnonymousQuestion, AnonymousAnswer
-    aq_list = AnonymousQuestion.objects.filter(session_key = old_session)
-    aa_list = AnonymousAnswer.objects.filter(session_key = old_session)
-    import settings
-    if settings.EMAIL_VALIDATION == 'on':#add user to the record
-        for aq in aq_list:
-            aq.author = user
-            aq.save()
-        for aa in aa_list:
-            aa.author = user
-            aa.save()
-        #maybe add pending posts message?
-    else: #just publish the questions
-        for aq in aq_list:
-            aq.publish(user)
-        for aa in aa_list:
-            aa.publish(user)
-
-user_logged_in.connect(post_stored_anonymous_content)
+#def post_stored_anonymous_content(user,old_session,**kwargs):
+#    from forum.models import AnonymousQuestion, AnonymousAnswer
+#    aq_list = AnonymousQuestion.objects.filter(session_key = old_session)
+#    aa_list = AnonymousAnswer.objects.filter(session_key = old_session)
+#    import settings
+#    if settings.EMAIL_VALIDATION == 'on':#add user to the record
+#        for aq in aq_list:
+#            aq.author = user
+#            aq.save()
+#        for aa in aa_list:
+#            aa.author = user
+#            aa.save()
+#        #maybe add pending posts message?
+#    else: #just publish the questions
+#        for aq in aq_list:
+#            aq.publish(user)
+#        for aa in aa_list:
+#            aa.publish(user)
+#
+#user_logged_in.connect(post_stored_anonymous_content)

forum/authentication/__init__.py

@@ -5,7 +5,7 @@
 from django.db.models.signals import post_save
 
 from forum.models.user import activity_record
-from forum.models import Badge, Award, Activity
+from forum.models import Badge, Award, Activity, Node
 
 import logging
 
@@ -74,6 +74,14 @@ def handler(instance):
 
         super(PostCountableAbstractBadge, self).__init__(model, field, expected_value, handler)
 
+class NodeCountableAbstractBadge(CountableAbstractBadge):
+    def __init__(self, node_type, field, expected_value):
+
+        def handler(instance):
+            if instance.node_type == node_type:
+                self.award_badge(instance.author, instance)
+
+        super(NodeCountableAbstractBadge, self).__init__(Node, field, expected_value, handler)
 
 class ActivityAbstractBadge(AbstractBadge):
 

forum/badges/base.py

@@ -126,27 +126,16 @@ class AskForm(forms.Form):
     tags   = TagNamesField()
     wiki = WikiField()
 
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
 
 class AnswerForm(forms.Form):
     text   = EditorField()
     wiki   = WikiField()
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email_notify = EmailNotifyField()
-    def __init__(self, question, user, *args, **kwargs):
+
+    def __init__(self, question, *args, **kwargs):
         super(AnswerForm, self).__init__(*args, **kwargs)
-        self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
+
         if question.wiki and settings.WIKI_ON:
             self.fields['wiki'].initial = True
-        if user.is_authenticated():
-            if user in question.followed_by.all():
-                self.fields['email_notify'].initial = True
-                return
-        self.fields['email_notify'].initial = False
 
 
 class CloseForm(forms.Form):
@@ -165,27 +154,34 @@ class RevisionForm(forms.Form):
     """
     revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))
 
-    def __init__(self, post, latest_revision, *args, **kwargs):
+    def __init__(self, post, *args, **kwargs):
         super(RevisionForm, self).__init__(*args, **kwargs)
+
         revisions = post.revisions.all().values_list(
             'revision', 'author__username', 'revised_at', 'summary')
         date_format = '%c'
         self.fields['revision'].choices = [
             (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
             for r in revisions]
-        self.fields['revision'].initial = latest_revision.revision
+
+        self.fields['revision'].initial = post.active_revision.revision
 
 class EditQuestionForm(forms.Form):
     title  = TitleField()
     text   = EditorField()
     tags   = TagNamesField()
     summary = SummaryField()
 
-    def __init__(self, question, revision, *args, **kwargs):
+    def __init__(self, question, revision=None, *args, **kwargs):
         super(EditQuestionForm, self).__init__(*args, **kwargs)
+
+        if revision is None:
+            revision = question.active_revision
+
         self.fields['title'].initial = revision.title
-        self.fields['text'].initial = revision.text
+        self.fields['text'].initial = revision.body
         self.fields['tags'].initial = revision.tagnames
+            
         # Once wiki mode is enabled, it can't be disabled
         if not question.wiki:
             self.fields['wiki'] = WikiField()
@@ -194,9 +190,13 @@ class EditAnswerForm(forms.Form):
     text = EditorField()
     summary = SummaryField()
 
-    def __init__(self, answer, revision, *args, **kwargs):
+    def __init__(self, answer, revision=None, *args, **kwargs):
         super(EditAnswerForm, self).__init__(*args, **kwargs)
-        self.fields['text'].initial = revision.text
+
+        if revision is None:
+            revision = answer.active_revision
+
+        self.fields['text'].initial = revision.body
 
 class EditUserForm(forms.Form):
     email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))