engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr: Refactor PR update error message handling.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-27 13:55:58 +02:00
parent 0236ad15ca
commit 053382901e
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rhodecode/controllers/pullrequests.py
View file

@ -519,14 +519,8 @@ class PullrequestsController(BaseRepoController):
def _update_commits(self, pull_request): def _update_commits(self, pull_request):
resp = PullRequestModel().update_commits(pull_request) resp = PullRequestModel().update_commits(pull_request)
msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
# Abort if pull request update failed. if resp.success:
if not resp.success:
h.flash(msg, category='error')
return
if resp.reason == UpdateFailureReason.NONE:
msg = _( msg = _(
u'Pull request updated to "{source_commit_id}" with ' u'Pull request updated to "{source_commit_id}" with '
u'{count_added} added, {count_removed} removed commits.') u'{count_added} added, {count_removed} removed commits.')
@ -561,11 +555,14 @@ class PullrequestsController(BaseRepoController):
channelstream_request( channelstream_request(
channelstream_config, [payload], '/message', channelstream_config, [payload], '/message',
raise_exc=False) raise_exc=False)
elif resp.reason == UpdateFailureReason.NO_CHANGE:
# Display a warning if no update is needed.
h.flash(msg, category='warning')
else: else:
h.flash(msg, category='error') msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
warning_reasons = [
UpdateFailureReason.NO_CHANGE,
UpdateFailureReason.WRONG_REF_TPYE,
]
category = 'warning' if resp.reason in warning_reasons else 'error'
h.flash(msg, category=category)
@auth.CSRFRequired() @auth.CSRFRequired()
@LoginRequired() @LoginRequired()

2
rhodecode/model/pull_request.py
View file

@ -537,7 +537,7 @@ class PullRequestModel(BaseModel):
if source_ref_id == source_commit.raw_id: if source_ref_id == source_commit.raw_id:
log.debug("Nothing changed in pull request %s", pull_request) log.debug("Nothing changed in pull request %s", pull_request)
return UpdateResponse( return UpdateResponse(
success=True, success=False,
reason=UpdateFailureReason.NO_CHANGE, reason=UpdateFailureReason.NO_CHANGE,
old=pull_request, new=None, changes=None) old=pull_request, new=None, changes=None)