You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/08/26 22:05:11 UTC
git commit: [#6596] Removed (deprecated) "votes" field on Ticket and
replaced with calculated property
Updated Branches:
refs/heads/cj/6596 [created] 7b595e1b4
[#6596] Removed (deprecated) "votes" field on Ticket and replaced with calculated property
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7b595e1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7b595e1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7b595e1b
Branch: refs/heads/cj/6596
Commit: 7b595e1b405d34b3a13f752e7fcd9a2048f9117f
Parents: 8c6605d
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Mon Aug 26 20:04:30 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Aug 26 20:04:37 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 8 +++++---
ForgeTracker/forgetracker/model/ticket.py | 2 +-
.../templates/tracker_widgets/ticket_search_results.html | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7b595e1b/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 294c3d0..82355cd 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -833,7 +833,7 @@ class VotableArtifact(MappedClass):
session = main_orm_session
name = 'vote'
- votes = FieldProperty(int, if_missing=0)
+ votes = FieldProperty(S.Deprecated)
votes_up = FieldProperty(int, if_missing=0)
votes_down = FieldProperty(int, if_missing=0)
votes_up_users = FieldProperty([str], if_missing=list())
@@ -854,7 +854,6 @@ class VotableArtifact(MappedClass):
else:
self.votes_up_users.append(user.username)
self.votes_up += 1
- self.votes = self.votes_up - self.votes_down
def vote_down(self, user):
voted = self.user_voted(user)
@@ -871,7 +870,6 @@ class VotableArtifact(MappedClass):
else:
self.votes_down_users.append(user.username)
self.votes_down += 1
- self.votes = self.votes_up - self.votes_down
def user_voted(self, user):
"""Check that user voted for this artifact.
@@ -888,6 +886,10 @@ class VotableArtifact(MappedClass):
return 0
@property
+ def votes_up_net(self):
+ return self.votes_up - self.votes_down
+
+ @property
def votes_up_percent(self):
votes_count = self.votes_up + self.votes_down
if votes_count == 0:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7b595e1b/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index d16039e..25e5b6a 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -589,7 +589,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
private_b=self.private,
votes_up_i=self.votes_up,
votes_down_i=self.votes_down,
- votes_total_i=(self.votes_up - self.votes_down),
+ votes_total_i=self.votes_up_net,
import_id_s=ImportIdConverter.get().simplify(self.import_id)
)
for k, v in self.custom_fields.iteritems():
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7b595e1b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
index af93d72..975b363 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -64,7 +64,7 @@
{%- endfor -%}
</td>
{% elif col['name'] == 'votes' %}
- <td>{{ t.votes }}</td>
+ <td>{{ t.votes_up_net }}</td>
{% else %}
{% set fld = c.app.globals.get_custom_field(col['name']) %}
{% if fld and fld.type == 'user' %}