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

@@ @@ -341,43 +341,42 @@ class ChangesetController(BaseRepoContro @@
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def changeset_download(self, revision):
         return self._index(revision, method='download')
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     @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))
         c.co = comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.db_repo.repo_id,
             user=c.authuser.user_id,
             revision=revision,
             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 !
             try:
                 ChangesetStatusModel().set_status(
                     c.db_repo.repo_id,
                     status,
                     c.authuser.user_id,
                     comm,
                     revision=revision,
                     dont_allow_on_closed_pull_request=True

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -537,55 +537,53 @@ class PullrequestsController(BaseRepoCon @@
     @LoginRequired()
     @NotAnonymous()
     @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)
         if pull_request.is_closed():
             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:
                 _def = _('Closing with') + ' ' + _def
             text = text or _def
         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'),
             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
+        )
         action_logger(self.authuser,
                       'user_commented_pull_request:%s' % pull_request_id,
                       c.db_repo, self.ip_addr, self.sa)
         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,
                     c.authuser.user_id,
                     comm,
                     pull_request=pull_request_id
+                )
             if close_pr:
                 if status in ['rejected', 'approved']:
                     PullRequestModel().close_pull_request(pull_request_id)
                     action_logger(self.authuser,

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -151,25 +151,24 @@ @@
                   _('Use @username inside this text to send notification to this Kallithea user')))|n}
                 <div id="preview-btn" class="preview-btn btn btn-mini">${_('Preview')}</div>
             </div>
             <div class="mentions-container" id="mentions_container"></div>
             ${h.textarea('text', class_="comment-block-ta")}
             %if change_status:
               <div id="status_block_container" class="status-block">
                 %if is_pr:
                   ${_('Vote for pull request status')}:
                 %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')}
                 </label>
                 %for status,lbl in c.changeset_statuses:
                     <span style="margin-left: 15px;">
                         <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
                         <label for="${status}"><img src="${h.url('/images/icons/flag_status_%s.png' % status)}" />${lbl}</label>
                     </span>
                 %endfor
                 %if is_pr and change_status:
                 <input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}">
@@ @@ -192,25 +191,24 @@ @@
         </div>
         ${h.end_form()}
     </div>
     %endif
 </div>
 <script>
 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');
            YUD.get('save_close').disabled = false;
        }else{
            YUD.addClass('save_close_label', 'disabled');
            YUD.get('save_close').disabled = true;
            YUD.get('save_close').checked = false;
+       }
      %endif
+   }
    YUE.on(YUQ('.status_change_radio'), 'change',function(e){

0 comments (0 inline, 0 general)