コミット: c85b54e49c35798279190de30cb8443d0ccab25b - allura (git)

allura

コミットメタ情報

• リビジョン: c85b54e49c35798279190de30cb8443d0ccab25b (tree)
• 日時: 2012-07-18 04:25:22
• 作者: Yuriy <yuriyarhipovua@yand...>
• コミッター: Cory Johns

ログメッセージ

[#4481] ticket:103 fix http://rb.42cc.co/r/74/

変更サマリ

• modified: Allura/allura/model/artifact.py
• modified: ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html

差分

--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -683,7 +683,7 @@ class VotableArtifact(MappedClass):
             self.votes_down = self.votes_down - 1
         self.votes_up_users.append(user.username)
         self.votes_up += 1
-        self.votes += 1
+        self.votes = self.votes_up - self.votes_down
 
     def vote_down(self, user):
         if user.username in self.votes_down_users:
@@ -694,7 +694,7 @@ class VotableArtifact(MappedClass):
             self.votes_up = self.votes_up - 1
         self.votes_down_users.append(user.username)
         self.votes_down += 1
-        self.votes -= 1
+        self.votes = self.votes_up - self.votes_down
 
     def user_voted(self, user):
         """Check that user voted for this artifact.

--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -32,7 +32,7 @@
               {% elif col['name'] == 'assigned_to' %}
                 <td>{% if t.assigned_to_id %}{{t.assigned_to.display_name}}{% endif %}</td>
               {% elif col['name'] == 'votes' %}
-                <td>{{ t.votes }}</td>
+                <td><div style="color:{%if t.votes>0 %}green{%endif%}{%if t.votes<0 %}red{%endif%}">{{ t.votes }}</div></td>
               {% else %}
                 {% set fld = c.app.globals.get_custom_field(col['name']) %}
                 {% if fld and fld.type == 'user' %}