diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py
+++ b/kallithea/controllers/changeset.py
@@ -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 !
diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py
+++ b/kallithea/controllers/pullrequests.py
@@ -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,
diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html
--- a/kallithea/templates/changeset/changeset_file_comment.html
+++ b/kallithea/templates/changeset/changeset_file_comment.html
@@ -160,7 +160,6 @@
%else:
${_('Set changeset status')}:
%endif
-