Mercurial > kallithea
changeset 4357:c666a68e2a4d
comments: drop change_changeset_status - the value from 'No change' is enough
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Jul 2014 18:47:02 +0200 |
| parents | eac6c70e63e8 |
| children | 068ca0afcf9f |
| files | kallithea/controllers/changeset.py kallithea/controllers/pullrequests.py kallithea/templates/changeset/changeset_file_comment.html |
| diffstat | 3 files changed, 6 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/changeset.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/controllers/changeset.py Fri Jul 18 18:47:02 2014 +0200 @@ -350,9 +350,8 @@ @jsonify def comment(self, repo_name, revision): status = request.POST.get('changeset_status') - change_status = request.POST.get('change_changeset_status') text = request.POST.get('text') - if status and change_status: + if status: text = text or (_('Status change -> %s') % ChangesetStatus.get_status_lbl(status)) @@ -364,11 +363,11 @@ f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), status_change=(ChangesetStatus.get_status_lbl(status) - if status and change_status else None) + if status else None) ) # get status if set ! - if status and change_status: + if status: # if latest status was from pull request and it's closed # disallow changing status ! # dont_allow_on_closed_pull_request = True !
--- a/kallithea/controllers/pullrequests.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/controllers/pullrequests.py Fri Jul 18 18:47:02 2014 +0200 @@ -546,12 +546,11 @@ raise HTTPForbidden() status = request.POST.get('changeset_status') - change_status = request.POST.get('change_changeset_status') text = request.POST.get('text') close_pr = request.POST.get('save_close') allowed_to_change_status = self._get_is_allowed_change_status(pull_request) - if status and change_status and allowed_to_change_status: + if status and allowed_to_change_status: _def = (_('Status change -> %s') % ChangesetStatus.get_status_lbl(status)) if close_pr: @@ -565,8 +564,7 @@ f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), status_change=(ChangesetStatus.get_status_lbl(status) - if status and change_status - and allowed_to_change_status else None), + if status and allowed_to_change_status else None), closing_pr=close_pr ) @@ -576,7 +574,7 @@ if allowed_to_change_status: # get status if set ! - if status and change_status: + if status: ChangesetStatusModel().set_status( c.db_repo.repo_id, status,
--- a/kallithea/templates/changeset/changeset_file_comment.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset_file_comment.html Fri Jul 18 18:47:02 2014 +0200 @@ -160,7 +160,6 @@ %else: ${_('Set changeset status')}: %endif - <input id="show_changeset_status_box" type="checkbox" name="change_changeset_status" style="display: none;" /> <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" /> <label for="changeset_status_unchanged"> ${_('No change')} @@ -201,7 +200,6 @@ MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA); var set_close_button_state = function(cur_val){ - YUD.get('show_changeset_status_box').checked = (cur_val != ''); %if is_pr and change_status: if (cur_val == 'approved' || cur_val == 'rejected') { YUD.removeClass('save_close_label', 'disabled');