kallithea Changeset - 140f2811fc6f

Changeset - 140f2811fc6f

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Thomas De Schampheleire - 11 years ago 2015-04-23 21:44:19
thomas.de.schampheleire@gmail.com

comments: avoid storing 'No comments' text when changing status

When a general comment (with or without status change) is added to a
changeset or pull request, and no text was added, Kallithea automatically
used 'No comments' as text. The stub text is added to the database as if it has
been entered by the user and it can thus not easily be identified as an
automatic comment.

This commit makes following changes:
- allow adding an empty comment to the database when there is a status
change. An empty comment without status change is ignored.
- do not add a stub text to the database, but generate it on demand
- the stub text is shown in italic font to differentiate it from user-entered
text

Currently there is a large amount of duplication between
controllers/changeset.py and controllers/pullrequests.py, which is to be
cleaned up in a later commit.

5 files changed with 13 insertions and 3 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/pullrequests.py

kallithea/model/comment.py

kallithea/public/css/style.css

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -328,49 +328,49 @@ class ChangesetController(BaseRepoContro @@
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def changeset_raw(self, revision):
         return self._index(revision, method='raw')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def changeset_patch(self, revision):
         return self._index(revision, method='patch')
     @LoginRequired()
     @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')
-        text = request.POST.get('text', '').strip() or _('No comments.')
         text = request.POST.get('text', '').strip()
         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 else None)
+        )
         # get status if set !
         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,

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -675,49 +675,49 @@ class PullrequestsController(BaseRepoCon @@
         (c.pull_request_reviewers,
          c.pull_request_pending_reviewers,
          c.current_voting_result,
          ) = cs_model.calculate_pull_request_result(c.pull_request)
         c.changeset_statuses = ChangesetStatus.STATUSES
         c.as_form = False
         c.ancestor = None # there is one - but right here we don't know which
         return render('/pullrequests/pullrequest_show.html')
     @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)
         status = 0
         close_pr = False
         allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
         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.')
         text = request.POST.get('text', '').strip()
         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'),
             line_no=request.POST.get('line'),
             status_change=(ChangesetStatus.get_status_lbl(status)
                            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:
                 ChangesetStatusModel().set_status(
                     c.db_repo.repo_id,

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -161,49 +161,49 @@ class ChangesetCommentsModel(BaseModel): @@
                 'threading': threading,
+            }
         return subj, body, recipients, notification_type, email_kwargs
     def create(self, text, repo, user, revision=None, pull_request=None,
                f_path=None, line_no=None, status_change=None, closing_pr=False,
                send_email=True):
         """
         Creates new comment for changeset or pull request.
         If status_change is not None this comment is associated with a
         status change of changeset or changesets associated with pull request
         :param text:
         :param repo:
         :param user:
         :param revision:
         :param pull_request: (for emails, not for comments)
         :param f_path:
         :param line_no:
         :param status_change: (for emails, not for comments)
         :param closing_pr: (for emails, not for comments)
         :param send_email: also send email
         """
         if not text:
+        if not status_change and not text:
             log.warning('Missing text for comment, skipping...')
             return
         repo = self._get_repo(repo)
         user = self._get_user(user)
         comment = ChangesetComment()
         comment.repo = repo
         comment.author = user
         comment.text = text
         comment.f_path = f_path
         comment.line_no = line_no
         if revision:
             comment.revision = revision
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             comment.pull_request = pull_request
         else:
             raise Exception('Please specify revision or pull_request_id')
         Session().add(comment)
         Session().flush()
         if send_email:

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4326,48 +4326,52 @@ div.rst-block pre { @@
     padding: 4px 2px 2px 2px;
+}
 .comments .comment .meta .date {
     float: left;
     padding: 4px 4px 0px 4px;
+}
 .comments .comment .text {
     background-color: #FAFAFA;
+}
 .comment .text div.rst-block p {
     margin: 0.5em 0px !important;
+}
 .comments .comments-number,
 .pr-comments-number {
     margin: 5px;
     padding: 0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
+}
 .automatic-comment {
     font-style: italic;
+}
 /** comment form **/
 .status-block {
     margin: 5px;
     clear: both
+}
 div.comment-form {
     margin-top: 20px;
+}
 .comment-form strong {
     display: block;
     margin-bottom: 15px;
+}
 .comment-form textarea {
     width: 100%;
     height: 100px;
     font-family: Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 form.comment-form {

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -30,49 +30,55 @@ @@
          %else:
             %if co.status_change:
               ${_('Status change on changeset')}:
             %else:
               ${_('Comment on changeset')}
             %endif
          %endif
         </span>
        </div>
         %if co.status_change:
            <div  style="float:left" class="changeset-status-container">
              <div style="float:left;padding:10px 2px 0px 2px"></div>
              <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
              <div class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></div>
            </div>
         %endif
       <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
       %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:
           <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>
       %endif
       </div>
       <div class="text">
         %if co.text:
           ${h.rst_w_mentions(co.text)|n}
         %else:
           <div class="rst-block automatic-comment">
             <p>${_('No comments.')}</p>
           </div>
         %endif
       </div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form()">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form ac">
   %if c.authuser.username != 'default':
     ${h.form('#', class_='inline-form')}
       <div id="edit-container_{1}" class="clearfix">
         <div class="comment-help">${_('Commenting on line {1}.')}
           ${(_('Comments parsed using %s syntax with %s support.') % (
                  ('<a href="%s">RST</a>' % h.url('rst_help')),
                    ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to notify another user'))
+               )
             )|n
+           }
         </div>
         <div class="mentions-container" id="mentions_container_{1}"></div>
         <textarea id="text_{1}" name="text" class="comment-block-ta yui-ac-input"></textarea>
       </div>
       <div id="preview-container_{1}" class="clearfix" style="display:none">

0 comments (0 inline, 0 general)