kallithea Changeset - 051624cb5f3a

Changeset - 051624cb5f3a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 11 years ago 2015-01-27 22:03:55
thomas.de_schampheleire@alcatel-lucent.com

comment handling: clarify shown comment count (inline vs general)

Instead of showing the number of comments as:
y comments (z inline)
show it as:
x comments (z inline, y general)

2 files changed with 11 insertions and 7 deletions:

kallithea/templates/changeset/changeset_file_comment.html

kallithea/tests/functional/test_changeset_comments.py

0 comments (0 inline, 0 general)

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -105,16 +105,20 @@ @@
   %endif
   </div>
 </div>
 </%def>
 ## show comment count
+## show comment count as "x comments (y inline, z general)"
 <%def name="comment_count(inline_cnt, general_cnt)">
 ${ungettext("%d comment", "%d comments", general_cnt) % general_cnt} ${ungettext("(%d inline)", "(%d inline)", inline_cnt) % inline_cnt}
 <span class="firstlink"></span>
     ${'%s (%s, %s)' % (
         ungettext("%d comment", "%d comments", inline_cnt + general_cnt) % (inline_cnt + general_cnt),
         ungettext("%d inline", "%d inline", inline_cnt) % inline_cnt,
         ungettext("%d general", "%d general", general_cnt) % general_cnt
     )}
     <span class="firstlink"></span>
 </%def>
 ## generates inlines taken from c.comments var
 <%def name="inlines()">
     <div class="comments-number">
         ${comment_count(c.inline_cnt, len(c.comments))}

kallithea/tests/functional/test_changeset_comments.py

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ class TestChangeSetCommentsController(Te @@
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 1 comment (0 inline)'''
+            ''' 1 comment (0 inline, 1 general)'''
+        )
         self.assertEqual(Notification.query().count(), 1)
         self.assertEqual(ChangesetComment.query().count(), 1)
         notification = Notification.query().all()[0]
@@ @@ -77,13 +77,13 @@ class TestChangeSetCommentsController(Te @@
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         #test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         response.mustcontain(
             '''<div class="comments-number">'''
-            ''' 0 comments (1 inline)'''
+            ''' 1 comment (1 inline, 0 general)'''
+        )
         response.mustcontain(
             '''<div style="display:none" class="inline-comment-placeholder" '''
             '''path="vcs/web/simplevcs/views/repository.py" '''
             '''target_id="vcswebsimplevcsviewsrepositorypy">'''
+        )
@@ @@ -117,13 +117,13 @@ class TestChangeSetCommentsController(Te @@
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 1 comment (0 inline)'''
+            ''' 1 comment (0 inline, 1 general)'''
+        )
         self.assertEqual(Notification.query().count(), 2)
         users = [x.user.username for x in UserNotification.query().all()]
         # test_regular gets notification by @mention
@@ @@ -152,8 +152,8 @@ class TestChangeSetCommentsController(Te @@
         self.assertEqual(len(comments), 0)
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 0 comments (0 inline)'''
+            ''' 0 comments (0 inline, 0 general)'''
+        )

0 comments (0 inline, 0 general)