Mercurial > kallithea
changeset 4053:3625fd19b201
pull requests: add a 'Calculated' comment on current_changeset_status
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Jun 2013 02:13:05 +0200 |
parents | a7b7526c7f7c |
children | 95ec841bfe1f |
files | rhodecode/controllers/pullrequests.py rhodecode/model/changeset_status.py rhodecode/templates/pullrequests/pullrequest_show.html |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Wed Jun 12 02:13:05 2013 +0200 +++ b/rhodecode/controllers/pullrequests.py Wed Jun 12 02:13:05 2013 +0200 @@ -442,7 +442,7 @@ 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, )
--- a/rhodecode/model/changeset_status.py Wed Jun 12 02:13:05 2013 +0200 +++ b/rhodecode/model/changeset_status.py Wed Jun 12 02:13:05 2013 +0200 @@ -64,11 +64,11 @@ 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:
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Wed Jun 12 02:13:05 2013 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Wed Jun 12 02:13:05 2013 +0200 @@ -37,13 +37,13 @@ <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>