kallithea Changeset - 9cfc66a665ae

Changeset - 9cfc66a665ae

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2014-08-21 23:46:55
madski@unity3d.com

pull requests: rework handling of comments and texts when voting and closing

Close did not leave any records - now it does.

Status changes without comments repeated the status change in text - now it
doesn't repeat itself.

2 files changed with 10 insertions and 14 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -346,16 +346,13 @@ class ChangesetController(BaseRepoContro @@
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     @jsonify
     def comment(self, repo_name, revision):
         status = request.POST.get('changeset_status')
         text = request.POST.get('text')
         if status:
             text = text or (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
         text = request.POST.get('text', '').strip() or _('No comments.')
         c.co = comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.db_repo.repo_id,
             user=c.authuser.user_id,
             revision=revision,

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -684,23 +684,22 @@ class PullrequestsController(BaseRepoCon @@
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     @jsonify
     def comment(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         status = request.POST.get('changeset_status')
         text = request.POST.get('text')
         close_pr = request.POST.get('save_close')
         status = 0
         close_pr = False
         allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
         if status and allowed_to_change_status:
             _def = (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
             if close_pr:
                 _def = _('Closing with') + ' ' + _def
             text = text or _def
         if allowed_to_change_status:
             status = request.POST.get('changeset_status')
             close_pr = request.POST.get('save_close')
         text = request.POST.get('text', '').strip() or _('No comments.')
         if close_pr:
             text = _('Closing.') + '\n' + text
         comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.db_repo.repo_id,
             user=c.authuser.user_id,
             pull_request=pull_request_id,
             f_path=request.POST.get('f_path'),

0 comments (0 inline, 0 general)