Changeset 247:fa2184a41e21

Timestamp:

23.02.2010 16:19:20 (2 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

closed #50, #61: Now user can't set reputation to youself and can vote for post only once. WARNING: Reputation model was changed, pls migrate it youself.

Location:

djangobb/djangobb_forum

Files:

• admin.py (modified) (1 diff)
• forms.py (modified) (2 diffs)
• models.py (modified) (1 diff)
• templates/forum/reputation.html (modified) (2 diffs)
• templates/forum/reputation_form.html (modified) (3 diffs)
• templates/forum/topic.html (modified) (1 diff)
• views.py (modified) (3 diffs)

djangobb/djangobb_forum/admin.py

@@ -30 +30 @@
 
 class ReputationAdmin(admin.ModelAdmin):
-    list_display = ['from_user', 'to_user', 'topic', 'sign', 'time', 'reason']
-    raw_id_fields = ['from_user', 'to_user', 'topic']
+    list_display = ['from_user', 'to_user', 'post', 'sign', 'time', 'reason']
+    raw_id_fields = ['from_user', 'to_user', 'post']
 
 class ReportAdmin(admin.ModelAdmin):

djangobb/djangobb_forum/forms.py

@@ -294 +294 @@
     class Meta:
         model = Reputation
-        fields = ['reason', 'topic', 'sign']
+        fields = ['reason', 'post', 'sign']
 
     def __init__(self, *args, **kwargs):
         self.from_user = kwargs.pop('from_user', None)
         self.to_user = kwargs.pop('to_user', None)
-        self.topic = kwargs.pop('topic', None)
+        self.post = kwargs.pop('post', None)
         self.sign = kwargs.pop('sign', None)
         super(ReputationForm, self).__init__(*args, **kwargs)
-        self.fields['topic'].widget = forms.HiddenInput()
+        self.fields['post'].widget = forms.HiddenInput()
         self.fields['sign'].widget = forms.HiddenInput()
         self.fields['reason'].widget = forms.Textarea(attrs={'class':'bbcode'})
@@ -315 +315 @@
             return user
 
+    def clean(self):
+        try:
+            Reputation.objects.get(from_user=self.from_user, post=self.cleaned_data['post'])
+        except Reputation.DoesNotExist:
+            pass
+        else:
+            raise forms.ValidationError(_('You already voted for this post'))
+
     def save(self, commit=True):
         reputation = super(ReputationForm, self).save(commit=False)
         reputation.from_user = self.from_user
         reputation.to_user = self.to_user
-        reputation.time = datetime.now()
         if commit:
             reputation.save()

djangobb/djangobb_forum/models.py

@@ -245 +245 @@
     from_user = models.ForeignKey(User, related_name='reputations_from', verbose_name=_('From'))
     to_user = models.ForeignKey(User, related_name='reputations_to', verbose_name=_('To'))
-    topic = models.ForeignKey(Topic, related_name='topic', verbose_name=_('Topic'))
-    time = models.DateTimeField(_('Time'), blank=True)
+    post = models.ForeignKey(Post, related_name='post', verbose_name=_('Post'))
+    time = models.DateTimeField(_('Time'), auto_now_add=True)
     sign = models.IntegerField(_('Sign'), choices=SIGN_CHOICES, default=0)
-    reason = models.TextField(_('Reason'), blank=True, default='', max_length=1000)
+    reason = models.TextField(_('Reason'), max_length=1000)
 
     class Meta:
         verbose_name = _('Reputation')
         verbose_name_plural = _('Reputations')
-
-    def __unicode__(self):
-        return u'T[%d], FU[%d], TU[%d]: %s' % (self.topic.id, self.from_user.id, self.to_user.id, unicode(self.time))
+        unique_together = (('from_user', 'post'),)
+
+    def __unicode__(self):
+        return u'T[%d], FU[%d], TU[%d]: %s' % (self.post.id, self.from_user.id, self.to_user.id, unicode(self.time))
 
 

djangobb/djangobb_forum/templates/forum/reputation.html

@@ -20 +20 @@
                                 <tr>
                                 <th class="tc3" style="width: 15%;">{% trans "From user" %}</th>
-                                <th class="tc3" style="width: 15%;">{% trans "For topic" %}</th>
+                                <th class="tc3" style="width: 15%;">{% trans "For post in topic" %}</th>
                                 <th class="tc3" style="width: 35%;">{% trans "Reason" %}</th>
                                 <th class="tc3" style="width: 10%; text-align: center;">{% trans "Estimation" %}</th>
@@ -33 +33 @@
                                         <tr>
                                                 <td><a href="{% url djangobb:reputation reputation.from_user %}">{{ reputation.from_user }}</a></td>
-                                                <td>{% link reputation.topic %}</td>
+                                                <td><a href="{{ reputation.post.get_absolute_url }}">{{ reputation.post.topic }}</a></td>
                                                 <td>{{ reputation.reason }}</td>
                                                 <td style="text-align: center;">

djangobb/djangobb_forum/templates/forum/reputation_form.html

@@ -10 +10 @@
                         <form action="{% url djangobb:reputation form.to_user %}" method="post">
                         <table cellspacing="0">
-                                {{ form.topic }}
+                                {{ form.errors.as_ul }}
+                                {{ form.post }}
                                 {{ form.sign }}
                                 <tbody><tr>
@@ -19 +20 @@
                                         <td class="tc4" width="30%">{% trans "To whom we change a reputation:" %}</td>
                                         <td class="tc4" width="70%">{{ form.to_user }}</td>
-
                                 </tr>
                                 <tr>
-                                        <td class="tc4" width="30%">{% trans "The reason of change of reputation:" %}</td>
+                                        <td class="tc4" width="30%"></td>
                                         <td class="tc4" width="70%">{{ form.reason }}</td>
                                 </tr>                           
@@ -34 +34 @@
                                                 {% endifequal %}
                                         </td>
-
                                 </tr>
                         </tbody></table>

djangobb/djangobb_forum/templates/forum/topic.html

@@ -55 +55 @@
                                                 {% endif %}
                                                 {% if forum_settings.REPUTATION_SUPPORT %}
-                                                        {% ifnotequal request.user post.user.username %}
-                                                                <dd><a href="{% url djangobb:reputation post.user %}">{% trans "Reputation" %}</a> : <a href="{% url djangobb:reputation post.user %}?action=plus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url djangobb:reputation post.user %}?action=minus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" border="0"></a></dd>
+                                                                <dd><a href="{% url djangobb:reputation post.user %}">{% trans "Reputation" %}</a>
+                                                        {% ifnotequal request.user post.user %} {# TODO: and user.is_authenticated #}
+                                                                : <a href="{% url djangobb:reputation post.user %}?action=plus&post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url djangobb:reputation post.user %}?action=minus&post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" border="0"></a></dd>
                                                         {% endifnotequal %}
                                                 {% endif %}

djangobb/djangobb_forum/views.py

@@ -496 +496 @@
 
     if 'action' in request.GET:
-        if 'topic_id' in request.GET:
+        if request.user == user:
+            return HttpResponseForbidden(u'You can not change the reputation of yourself')
+
+        if 'post_id' in request.GET:
             sign = 0
-            topic_id = request.GET['topic_id']
-            form.fields['topic'].initial = topic_id
+            post_id = request.GET['post_id']
+            form.fields['post'].initial = post_id
+            print form.fields['post']
             if request.GET['action'] == 'plus':
                 form.fields['sign'].initial = 1
@@ -511 +515 @@
 
     elif request.method == 'POST':
-        if 'del_reputation' in request.POST:
+        if 'del_reputation' in request.POST and request.user.is_superuser:
             reputation_list = request.POST.getlist('reputation_id')
             for reputation_id in reputation_list:
@@ -519 +523 @@
         elif form.is_valid():
             form.save()
-            topic_id = request.POST['topic']
-            topic = get_object_or_404(Topic, id=topic_id)
-            return HttpResponseRedirect(topic.get_absolute_url())
+            post_id = request.POST['post']
+            post = get_object_or_404(Post, id=post_id)
+            return HttpResponseRedirect(post.get_absolute_url())
         else:
-            raise Http404
+            return {'form': form,
+                    'TEMPLATE': 'forum/reputation_form.html'
+                    }
     else:
         reputations = Reputation.objects.filter(to_user=user).order_by('-time').select_related()