From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 7 May 2010 22:18:04 +0000 (+0000)
Subject: Fix error reported at http://meta.osqa.net/question/1673/default-values-on-badges... 
X-Git-Tag: live~964
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/b8f3a2323d03384198863e35d6467a8624a2e31a?hp=dbfc77cdf18bf52c3d35da5b8170d16753fe3a3a

Fix error reported at http://meta.osqa.net/question/1673/default-values-on-badges-page, also fix error where the last edited flag was not updating correctly and moved revisions to theyr own url.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@165 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/actions/node.py b/forum/actions/node.py
index be386fa..931b6e1 100644
--- a/forum/actions/node.py
+++ b/forum/actions/node.py
@@ -67,9 +67,13 @@ class ReviseAction(NodeEditAction):
 
     def process_data(self, **data):
         revision_data = self.create_revision_data(**data)
-        revision = self.node.create_revision(self.user, action=self, **revision_data)
+        revision = self.node.create_revision(self.user, **revision_data)
         self.extra = revision.revision
 
+    def process_action(self):
+        self.node.last_edited = self
+        self.node.save()
+
     def describe(self, viewer=None):
         return _("%(user)s edited %(post_desc)s") % {
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
@@ -85,7 +89,12 @@ class RetagAction(ActionProxy):
     def process_data(self, tagnames=''):
         active = self.node.active_revision
         revision_data = dict(summary=_('Retag'), title=active.title, tagnames=strip_tags(tagnames.strip()), body=active.body)
-        self.node.create_revision(self.user, action=self, **revision_data)
+        revision = self.node.create_revision(self.user, **revision_data)
+        self.extra = revision.revision
+
+    def process_action(self):
+        self.node.last_edited = self
+        self.node.save()
 
     def describe(self, viewer=None):
         return _("%(user)s retagged %(post_desc)s") % {
@@ -101,9 +110,13 @@ class RollbackAction(ActionProxy):
 
     def process_data(self, activate=None):
         previous = self.node.active_revision
-        self.node.activate_revision(self.user, activate, self)
+        self.node.activate_revision(self.user, activate)
         self.extra = "%d:%d" % (previous.revision, activate.revision)
 
+    def process_action(self):
+        self.node.last_edited = self
+        self.node.save()
+
     def describe(self, viewer=None):
         revisions = [NodeRevision.objects.get(node=self.node, revision=int(n)) for n in self.extra.split(':')]
 
@@ -123,12 +136,12 @@ class CloseAction(ActionProxy):
     def process_action(self):
         self.node.extra_action = self
         self.node.marked = True
-        self.node.save()
+        self.node.update_last_activity(self.user, save=True)
 
     def cancel_action(self):
         self.node.extra_action = None
         self.node.marked = False
-        self.node.save()
+        self.node.update_last_activity(self.user, save=True)
 
     def describe(self, viewer=None):
         return _("%(user)s closed %(post_desc)s: %(reason)s") % {
diff --git a/forum/badges/__init__.py b/forum/badges/__init__.py
index 935effd..c413e82 100644
--- a/forum/badges/__init__.py
+++ b/forum/badges/__init__.py
@@ -1,3 +1,6 @@
 from forum.modules import get_modules_script
 
 get_modules_script('badges')
+
+from base import BadgesMeta
+
diff --git a/forum/models/action.py b/forum/models/action.py
index 583b27c..7909974 100644
--- a/forum/models/action.py
+++ b/forum/models/action.py
@@ -65,9 +65,19 @@ class Action(models.Model):
     def cancel_action(self):
         pass
 
+    @property
+    def verb(self):
+        return ""
+
     def describe(self, viewer=None):
         return ""
 
+    def get_absolute_url(self):
+        if self.node:
+            return self.node.get_absolute_url()
+        else:
+            return self.user.get_profile_url()
+
     def repute(self, user, value):
         repute = ActionRepute(action=self, user=user, value=value)
         repute.save()
diff --git a/forum/models/meta.py b/forum/models/meta.py
index 6465105..53d4c49 100644
--- a/forum/models/meta.py
+++ b/forum/models/meta.py
@@ -64,7 +64,15 @@ class Badge(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})        
+        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})
+
+    def save(self, *args, **kwargs):
+        if isinstance(self.awarded_count, models.expressions.ExpressionNode):
+            super(Badge, self).save(*args, **kwargs)
+            self.awarded_count = self.__class__.objects.filter(id=self.id).values_list('awarded_count', flat=True)[0]
+        else:
+            super(Badge, self).save(*args, **kwargs)
+
 
     class Meta:
         app_label = 'forum'
diff --git a/forum/models/node.py b/forum/models/node.py
index 3150e99..7c09189 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -166,6 +166,10 @@ class Node(BaseModel, NodeContent):
     def summary(self):
         return strip_tags(self.html)[:300]
 
+    @models.permalink
+    def get_revisions_url(self):
+        return ('revisions', (), {'id': self.id})
+
     def update_last_activity(self, user, save=False):
         self.last_activity_by = user
         self.last_activity_at = datetime.datetime.now()
@@ -181,13 +185,13 @@ class Node(BaseModel, NodeContent):
         revision.save()
         return revision
 
-    def create_revision(self, user, action=None, **kwargs):
+    def create_revision(self, user, **kwargs):
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
         revision = self._create_revision(user, number, **kwargs)
-        self.activate_revision(user, revision, action)
+        self.activate_revision(user, revision)
         return revision
 
-    def activate_revision(self, user, revision, action=None):
+    def activate_revision(self, user, revision):
         self.title = revision.title
         self.tagnames = revision.tagnames
         self.body = revision.body
@@ -195,9 +199,6 @@ class Node(BaseModel, NodeContent):
         self.active_revision = revision
         self.update_last_activity(user)
 
-        if action:
-            self.last_edited = action
-
         self.save()
 
     def get_tag_list_if_changed(self):
diff --git a/forum/models/user.py b/forum/models/user.py
index 53b5ee2..ff7bef1 100644
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -133,8 +133,9 @@ class User(BaseModel, DjangoUser):
     def delete_messages(self):
         self.message_set.all().delete()
 
+    @models.permalink
     def get_profile_url(self):
-        return "/%s%d/%s" % (_('users/'), self.id, slugify(self.username))
+        return ('user_profile', (), {'id': self.id, 'slug': slugify(self.username)})
 
     def get_profile_link(self):
         profile_link = u'<a href="%s">%s</a>' % (self.get_profile_url(),self.username)
diff --git a/forum/skins/default/templates/node/contributors_info.html b/forum/skins/default/templates/node/contributors_info.html
new file mode 100644
index 0000000..54e0bbe
--- /dev/null
+++ b/forum/skins/default/templates/node/contributors_info.html
@@ -0,0 +1,25 @@
+{% load extra_tags %}
+<div class='post-update-info'>
+    <p style="line-height:12px;">
+        {{ node_verb }}
+        <strong>{% diff_date node.added_at %}</strong>
+    </p>
+    {% gravatar node.author 32 %}
+    <p><a href="{{ node.author.get_profile_url }}">{{ node.author.username }}</a><br/>
+    {% get_score_badge node.author %}</p>
+</div>
+{% if node.last_edited %}
+    <div class='post-update-info'>
+        <p style="line-height:12px;">
+            <a href="{{ node.get_revisions_url }}">
+                {{ node.last_edited.verb }}
+                <strong>{% diff_date node.last_edited.at %}</strong>
+            </a>
+        </p>
+        {% ifnotequal node.author node.last_edited.by %}
+            {% gravatar node.last_edited.by 32 %}
+            <p><a href="{{ node.last_edited.by.get_profile_url }}">{{ node.last_edited.by.username }}</a><br/>
+            {% get_score_badge node.last_edited.by %}</p>
+        {% endifnotequal %}
+    </div>
+{% endif %}
diff --git a/forum/skins/default/templates/node/reviser_info.html b/forum/skins/default/templates/node/reviser_info.html
new file mode 100644
index 0000000..8b46047
--- /dev/null
+++ b/forum/skins/default/templates/node/reviser_info.html
@@ -0,0 +1,9 @@
+{% load extra_tags %}
+<div class='post-update-info'>
+    <p style="line-height:12px;">
+        <strong>{% diff_date revision.revised_at %}</strong>
+    </p>
+    {% gravatar revision.author 32 %}
+    <p><a href="{{ revised_at.author.get_profile_url }}">{{ revision.author.username }}</a><br/>
+    {% get_score_badge revision.author %}</p>
+</div>
\ No newline at end of file
diff --git a/forum/skins/default/templates/post_contributor_info.html b/forum/skins/default/templates/post_contributor_info.html
deleted file mode 100644
index 2770644..0000000
--- a/forum/skins/default/templates/post_contributor_info.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% load i18n %}
-{% load smart_if %}
-{% load extra_tags %}
-<div class='post-update-info'>
-{% ifequal contributor_type "original_author" %}
-    {% if wiki %}
-        <p>{% trans "community wiki" %}</p>
-        <p>
-            {% blocktrans count post.revisions.all|length as rev_count %}
-                one revision
-            {% plural %}
-                {{rev_count}} revisions
-            {% endblocktrans %}
-        </p>
-        <p>{{post.author.get_profile_link}}</p>
-    {% else %}
-        <p style="line-height:12px;">
-            {% ifequal post_type "question" %}
-                {% trans "asked" %}
-            {% else %}
-                {% ifequal post_type "answer" %}
-                    {% trans "answered" %}
-                {% else %}
-                    {% trans "posted" %}
-                {% endifequal %}
-            {% endifequal %}
-            {% ifequal post_type "revision" %}
-                <strong>{% diff_date post.revised_at %}</strong>
-            {% else %}
-                <strong>{% diff_date post.added_at %}</strong>
-            {% endifequal %}
-        </p>
-        {% gravatar post.author 32 %}
-        <p>{{post.author.get_profile_link}}<br/>
-        {% get_score_badge post.author %}</p>
-    {% endif %}
-{% else %}
-    {% if post.last_edited %}
-        <p style="line-height:12px;">
-        {% ifequal post_type 'question' %}
-        <a href="{% url question_revisions post.id %}">
-        {% else %}
-        <a href="{% url answer_revisions post.id %}">
-        {% endifequal %}
-        {% trans "updated" %} <strong>{% diff_date post.last_edited.at %}</strong>
-        </a>
-        </p>
-        {% if post.author != post.last_edited.by or wiki %}
-            {% gravatar post.last_edited.by 32 %}
-            <p style="float:left">{{post.last_edited.by.get_profile_link}}<br/>
-            {% get_score_badge post.last_edited.by %}</p>
-        {% endif %}
-    {% endif %}
-{% endifequal %}
-</div>
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index b6300d5..0a75aba 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -71,8 +71,7 @@
                                 {% post_controls question request.user %}
                             </div>
                             <div class="post-update-info-container">
-                                    {% post_contributor_info question "original_author" %}
-                                    {% post_contributor_info question "last_updater" %}
+                                    {% contributors_info question %}
                             </div>
                             {% comments question request.user %}
                         </div>
@@ -133,8 +132,7 @@
                                             {% post_controls answer request.user %}
                                         </div>
                                         <div class="post-update-info-container">
-                                                {% post_contributor_info answer "original_author" %}
-                                                {% post_contributor_info answer "last_updater" %}
+                                            {% contributors_info answer %}
                                         </div>
                                         {% comments answer request.user %}
                                     </div>
diff --git a/forum/skins/default/templates/revisions_question.html b/forum/skins/default/templates/revisions.html
similarity index 97%
rename from forum/skins/default/templates/revisions_question.html
rename to forum/skins/default/templates/revisions.html
index 3d07478..4c57e61 100644
--- a/forum/skins/default/templates/revisions_question.html
+++ b/forum/skins/default/templates/revisions.html
@@ -1,5 +1,5 @@
 {% extends "base_content.html" %}
-
+{% load node_tags %}
 {% load extra_tags %}
 {% load i18n %}
 {% load extra_filters %}
@@ -52,7 +52,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            {% post_contributor_info revision.inst %}
+                            {% reviser_info revision.inst %}
                         </div>
                     </td>
                 </tr>
diff --git a/forum/skins/default/templates/revisions_answer.html b/forum/skins/default/templates/revisions_answer.html
deleted file mode 100644
index 6df996c..0000000
--- a/forum/skins/default/templates/revisions_answer.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% extends "base_content.html" %}
-<!-- revisions_answer.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type="text/javascript">
-        //todo - take this out into .js file 
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('div.revision div[id^=rev-header-]').bind('click', function(){
-                var revId = this.id.substr(11);
-                toggleRev(revId); 
-            
-            });
-            lanai.highlightSyntax();
-        });
-        
-        function toggleRev(id) {
-            var arrow = $("#rev-arrow-" + id);
-            var visible = arrow.attr("src").indexOf("hide") > -1;
-
-            var path = $.i18n._('/') + "media/images/expander-arrow-" + 
-                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
-            arrow.attr("src", path);
-            $("#rev-body-" + id).slideToggle("fast");
-        }
-        
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Revision history" %} [<a href="{{ post.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="">
-    <div id="revisions">
-    {% for revision in revisions %}
-      <div class="revision">
-        <div id="rev-header-{{ revision.revision }}" class="header {% ifequal post.author_id revision.author_id %}author{% endifequal %}">
-          <div class="header-controls">
-            <table width="100%">
-                <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
-                                                                    src="{% media  "/media/images/expander-arrow-show.gif" %}"
-                                                                    alt="{% trans "click to hide/show revision" %}"/>
-                    </td>
-                    <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
-                    <td width="200px" style="vertical-align:middle">
-                        {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}</span></div>
-                        {% endif %}
-                        {% if request.user|can_edit_post:post %}
-                        <a href="{% url edit_answer post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
-                        {% endif %}
-  
-                    </td>
-                    <td align="right">
-                        <div class="revision-mark" >
-                            {% post_contributor_info revision %}
-                        </div>
-                    </td>
-                </tr>
-    	            
-            </table>
-          </div>
-        </div>
-        <div id="rev-body-{{ revision.revision }}" class="answerbody">
-            {{ revision.diff|safe }}
-        </div>
-      </div>
-    {% endfor %}
-    </div>
-</div>
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end revisions_answer.html -->
diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index b86c59d..b3a7e74 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -5,14 +5,10 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type="text/javascript">google.load("jquery", "1.4.2");</script>
+        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
 
         <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
-        
-        <script src="{% media  "/media/js/effects.core.min.js" %}" type="text/javascript"></script>
-        <script src="{% media  "/media/js/ui.core.js" %}" type="text/javascript"></script>
-        <script src="{% media  "/media/js/ui.datepicker.js" %}" type="text/javascript"></script>
 
         <script type="text/javascript">
             $().ready(function(){
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 822fdc1..a6c9047 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -123,23 +123,7 @@ def cnprog_pagesize(context):
             "is_paginated": context["is_paginated"]
         }
 
-@register.inclusion_tag("post_contributor_info.html")
-def post_contributor_info(post,contributor_type='original_author'):
-    """contributor_type: original_author|last_updater
-    """
-    if isinstance(post,Question):
-        post_type = 'question'
-    elif isinstance(post,Answer):
-        post_type = 'answer'
-    elif isinstance(post,(AnswerRevision, QuestionRevision, NodeRevision)):
-        post_type = 'revision'
-    return {
-        'post':post,
-        'post_type':post_type,
-        'wiki_on':settings.WIKI_ON,
-        'contributor_type':contributor_type
-    }
-        
+   
 @register.simple_tag
 def get_score_badge(user):
     BADGE_TEMPLATE = '<span class="score" title="%(reputation)s %(reputationword)s">%(reputation)s</span>'
diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index a744d36..72bfaf2 100644
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -121,3 +121,18 @@ def comments(post, user):
         'total': len(all_comments),
         'user': user,
     }
+
+
+@register.inclusion_tag("node/contributors_info.html")
+def contributors_info(node):
+    return {
+        'node_verb': (node.node_type == "question") and _("asked") or (
+                    (node.node_type == "answer") and _("answered") or _("posted")),
+        'node': node,
+    }
+
+
+@register.inclusion_tag("node/reviser_info.html")
+def reviser_info(revision):
+    return {'revision': revision}
+
diff --git a/forum/templatetags/user_tags.py b/forum/templatetags/user_tags.py
index 8ab1bb2..3ca19ac 100644
--- a/forum/templatetags/user_tags.py
+++ b/forum/templatetags/user_tags.py
@@ -56,7 +56,7 @@ def activity_item(parser, token):
     return ActivityNode(activity, viewer)
 
 
-@register.inclusion_tag('users/moderation.html')
+@register.inclusion_tag('users/action_info.html')
 def user_moderation(moderator, user):
-    
     return dict(user=user)
+
diff --git a/forum/urls.py b/forum/urls.py
index 7975644..28555e5 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -51,7 +51,7 @@ urlpatterns += patterns('',
     url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'),
     url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'),
     url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer, name='edit_answer'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.readers.revisions, name='answer_revisions'),
+    url(r'^%s(?P<id>\d+)/$' % _('revisions/'), app.readers.revisions, name='revisions'),
     url(r'^%s$' % _('questions/'), app.readers.questions, name='questions'),
     url(r'^%s%s$' % (_('questions/'), _('ask/')), app.writers.ask, name='ask'),
     url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'),
@@ -72,8 +72,6 @@ urlpatterns += patterns('',
     url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'),
     url(r'^%s(?P<id>\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'),
 
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.readers.revisions, name='question_revisions'),
-
     #place general question item in the end of other operations
     url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]*)$' % _('question/'), app.readers.question, name='question'),
     url(r'^%s$' % _('tags/'), app.readers.tags, name='tags'),
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 1714a51..c192820 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -276,7 +276,7 @@ def revisions(request, id):
         else:
             rev_ctx[i]['summary'] = revision.summary
             
-    return render_to_response('revisions_question.html', {
+    return render_to_response('revisions.html', {
                               'post': post,
                               'revisions': rev_ctx,
                               }, context_instance=RequestContext(request))