Commit: 62b22a6cb94bbf8bac34dff2a627f64542a3dac5 - allura (git)

allura

Commit MetaInfo

• Revisión: 62b22a6cb94bbf8bac34dff2a627f64542a3dac5 (tree)
• Tiempo: 2012-07-18 04:25:22
• Autor: Yuriy <yuriyarhipovua@yand...>
• Commiter: Cory Johns

Log Message

[#4481] ticket:103 Add votes

Cambiar Resumen

• modified: Allura/allura/model/artifact.py
• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/tracker_main.py

Diferencia incremental

--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -668,7 +668,7 @@ class VotableArtifact(MappedClass):
     class __mongometa__:
         session = main_orm_session
         name = 'vote'
-
+    votes = FieldProperty(int, if_missing=0)
     votes_up = FieldProperty(int, if_missing=0)
     votes_down = FieldProperty(int, if_missing=0)
     votes_up_users = FieldProperty([str], if_missing=list())
@@ -683,6 +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
 
     def vote_down(self, user):
         if user.username in self.votes_down_users:
@@ -693,6 +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
 
     def user_voted(self, user):
         """Check that user voted for this artifact.

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -276,6 +276,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             milestone_s=self.milestone,
             status_s=self.status,
             text=self.description,
+            votes_i=self.votes,
             snippet_s=self.summary)
         for k,v in self.custom_fields.iteritems():
             result[k + '_s'] = unicode(v)
@@ -575,6 +576,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             assigned_to_id=self.assigned_to_id and str(self.assigned_to_id) or None,
             status=self.status,
             private=self.private,
+            votes=self.votes,
             custom_fields=self.custom_fields)
 
     @classmethod
@@ -604,6 +606,9 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
                 tickets.append(t)
             else:
                 count = count -1
+            if c.app.config.options.get('EnableVoting'):
+                columns.append(dict(name='votes', sort_name='votes', label='Votes', active=True))
+
         return dict(
             tickets=tickets,
             count=count, q=json.dumps(query), limit=limit, page=page, sort=sort,

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -324,6 +324,8 @@ def mongo_columns():
     for field in c.app.globals.sortable_custom_fields_shown_in_search():
         columns.append(
             dict(name=field['name'], sort_name=field['name'], label=field['label'], active=True))
+    if c.app.config.options.get('EnableVoting'):
+        columns.append(dict(name='votes', sort_name='votes', label='Votes', active=True))
     return columns
 
 def solr_columns():
@@ -334,6 +336,8 @@ def solr_columns():
                dict(name='assigned_to', sort_name='assigned_to_s', label='Owner', active=True)]
     for field in c.app.globals.sortable_custom_fields_shown_in_search():
         columns.append(dict(name=field['name'], sort_name=field['sortable_name'], label=field['label'], active=True))
+    if c.app.config.options.get('EnableVoting'):
+        columns.append(dict(name='votes', sort_name='votes_i', label='Votes', active=True))
     return columns
 
 class RootController(BaseController):