kallithea Changeset - c666a68e2a4d

Changeset - c666a68e2a4d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 11 years ago 2014-07-18 18:47:02
madski@unity3d.com

comments: drop change_changeset_status - the value from 'No change' is enough

3 files changed with 6 insertions and 11 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/pullrequests.py

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -350,9 +350,8 @@ class ChangesetController(BaseRepoContro @@
     @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 @@ class ChangesetController(BaseRepoContro @@
             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 !

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -546,12 +546,11 @@ class PullrequestsController(BaseRepoCon @@
             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 @@ class PullrequestsController(BaseRepoCon @@
             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 @@ class PullrequestsController(BaseRepoCon @@
         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,

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -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 @@ YUE.onDOMReady(function () { @@
    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');

0 comments (0 inline, 0 general)