Commit: 728af41450f7841d4e344e2eaa26bbfc3078b250 - allura (git)

allura

Commit MetaInfo

• Revisão: 728af41450f7841d4e344e2eaa26bbfc3078b250 (tree)
• Hora: 2012-07-09 22:08:25
• Autor: Yaroslav Luzin <jardev@gmai...>
• Commiter: Yaroslav Luzin

Mensagem de Log

Merge branch '42cc_4481' into t103_Show_the_votes_total

Conflicts:
ForgeTracker/forgetracker/model/ticket.py

Mudança Sumário

• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/widgets/ticket_search.py

Diff

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -276,8 +276,11 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             milestone_s=self.milestone,
             status_s=self.status,
             text=self.description,
-            votes_i=self.votes,
-            snippet_s=self.summary)
+            snippet_s=self.summary,
+            votes_up_i=self.votes_up,
+            votes_down_i=self.votes_down,
+            votes_total_i=self.votes)
+
         for k,v in self.custom_fields.iteritems():
             result[k + '_s'] = unicode(v)
         if self.reported_by:

--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -84,6 +84,8 @@ class SearchHelp(ffw.Lightbox):
 <li>User who created the ticket - reported_by_s</li>
 <li>Status of the ticket - status</li>
 <li>Title of the ticket - summary</li>
+<li>Votes up/down of the ticket - votes_up/votes_down</li>
+<li>Votes total of the ticket - votes_total</li>
 <li>Custom field - the field name with an underscore in front like _custom</li>
 </ul>
 <h2>Example searches</h2>