kallithea Changeset - 3625fd19b201

Changeset - 3625fd19b201

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2013-06-12 02:13:05
madski@unity3d.com

Grafted from: 13bf474ae817

pull requests: add a 'Calculated' comment on current_changeset_status

3 files changed with 5 insertions and 5 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/model/changeset_status.py

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -442,7 +442,7 @@ class PullrequestsController(BaseRepoCon @@
         c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
                                            pull_request=pull_request_id)
-        # changeset(pull-request) status calulation based on reviewers
+        # (badly named) pull-request status calculation based on reviewer votes
         c.current_changeset_status = cs_model.calculate_status(
                                         c.pull_request_reviewers,
+                                         )

rhodecode/model/changeset_status.py

➞

Show inline comments

@@ @@ -64,11 +64,11 @@ class ChangesetStatusModel(BaseModel): @@
     def calculate_status(self, statuses_by_reviewers):
         """
         leading one wins, if number of occurrences are equal than weaker wins
         approved if consensus
         (old description: leading one wins, if number of occurrences are equal than weaker wins)
         :param statuses_by_reviewers:
         """
         status = None
         votes = defaultdict(int)
         reviewers_number = len(statuses_by_reviewers)
         for user, statuses in statuses_by_reviewers:

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ ${self.repo_context_bar('showpullrequest @@
           <div class="input">
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_changeset_status:
               <div title="${_('Pull request status')}" class="changeset-status-lbl">
+              <div title="${_('Pull request status calculated from votes')}" class="changeset-status-lbl">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_changeset_status)}
               </div>
               <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
+              <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div>
             %endif
             </div>
           </div>

0 comments (0 inline, 0 general)