1
=== modified file 'lib/lp/bugs/browser/bugtask.py'
2
--- lib/lp/bugs/browser/bugtask.py	2010-03-29 13:31:23 +0000
3
+++ lib/lp/bugs/browser/bugtask.py	2010-04-01 18:39:29 +0000
4
@@ -485,7 +485,12 @@
5
485
        # I have chosed to use this simple solution for now.
485
        # I have chosed to use this simple solution for now.
6
486
        #   -- kiko, 2006-07-11
486
        #   -- kiko, 2006-07-11
7
487
        try:
487
        try:
9
488
            return comments[index]
488
            comment = comments[index]
10
489
            if (comment.visible
11
490
                or check_permission('launchpad.Admin', self.context)):
12
491
                return comment
13
492
            else:
14
493
                return None
15
489
        except IndexError:
494
        except IndexError:
16
490
            return None
495
            return None
17
491
496
18
492
497
19
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt'
20
--- lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt	2009-08-28 14:31:15 +0000
21
+++ lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt	2010-04-01 18:39:29 +0000
22
@@ -8,13 +8,13 @@
23
8
    ...     'http://bugs.launchpad.dev'
8
    ...     'http://bugs.launchpad.dev'
24
9
    ...     '/jokosher/+bug/11')
9
    ...     '/jokosher/+bug/11')
25
10
    >>> user_browser.getControl(name='field.comment').value = (
10
    >>> user_browser.getControl(name='field.comment').value = (
27
11
    ...     'This comment will not visible when the test completes.')
11
    ...     'This comment will not be visible when the test completes.')
28
12
    >>> user_browser.getControl('Post Comment', index=-1).click()
12
    >>> user_browser.getControl('Post Comment', index=-1).click()
29
13
    >>> main_content = find_main_content(user_browser.contents)
13
    >>> main_content = find_main_content(user_browser.contents)
30
14
    >>> new_comment = main_content('div', 'boardCommentBody')[-1]
14
    >>> new_comment = main_content('div', 'boardCommentBody')[-1]
31
15
    >>> new_comment_text = extract_text(new_comment.div)
15
    >>> new_comment_text = extract_text(new_comment.div)
32
16
    >>> print new_comment_text
16
    >>> print new_comment_text
34
17
    This comment will not visible when the test completes.
17
    This comment will not be visible when the test completes.
35
18
18
36
19
Admin users can set a message's visible attribute to False.
19
Admin users can set a message's visible attribute to False.
37
20
In this case, the last message in the list, the one just added,
20
In this case, the last message in the list, the one just added,
38
@@ -26,7 +26,7 @@
39
26
    >>> bug_11 = getUtility(IBugSet).get(11)
26
    >>> bug_11 = getUtility(IBugSet).get(11)
40
27
    >>> message = bug_11.messages[-1]
27
    >>> message = bug_11.messages[-1]
41
28
    >>> print message.text_contents
28
    >>> print message.text_contents
43
29
    This comment will not visible when the test completes.
29
    This comment will not be visible when the test completes.
44
30
    >>> bug_message = getUtility(IBugMessageSet).getByBugAndMessage(
30
    >>> bug_message = getUtility(IBugMessageSet).getByBugAndMessage(
45
31
    ...     bug_11, message)
31
    ...     bug_11, message)
46
32
    >>> bug_message.visible = False
32
    >>> bug_message.visible = False
47
@@ -46,7 +46,21 @@
48
46
    This title, however, is the same as the bug title and so it will
46
    This title, however, is the same as the bug title and so it will
49
47
    be suppressed in the UI.
47
    be suppressed in the UI.
50
48
48
52
49
For admin users, the message is still visible.
49
Ordinary users also cannot reach the message via direct link.
53
50
54
51
    >>> comments = find_tags_by_class(
55
52
    ...     user_browser.contents, 'boardComment')
56
53
    >>> for comment in comments:
57
54
    ...     number_node = comment.find(None, 'bug-comment-index')
58
55
    ...     latest_index = extract_text(number_node)
59
56
    >>> user_browser.open(
60
57
    ...     'http://bugs.launchpad.dev'
61
58
    ...     '/jokosher/+bug/11/comments/%d' % (int(latest_index[1:]) + 1))
62
59
    Traceback (most recent call last):
63
60
    ...
64
61
    NotFound...
65
62
66
63
For admin users, the message is still visible in the bug page.
67
50
64
68
51
    >>> admin_browser.open(
65
    >>> admin_browser.open(
69
52
    ...     'http://bugs.launchpad.dev'
66
    ...     'http://bugs.launchpad.dev'
70
@@ -55,10 +69,27 @@
71
55
    >>> last_comment = main_content('div', 'boardCommentBody')[-1]
69
    >>> last_comment = main_content('div', 'boardCommentBody')[-1]
72
56
    >>> last_comment_text = extract_text(last_comment.div)
70
    >>> last_comment_text = extract_text(last_comment.div)
73
57
    >>> print last_comment_text
71
    >>> print last_comment_text
75
58
    This comment will not visible when the test completes.
72
    This comment will not be visible when the test completes.
76
59
73
78
60
Also, admin users will see the hidden message grayed out via an
74
Admin users will see the hidden message highlighted with an
79
61
'adminHiddenComment' style.
75
'adminHiddenComment' style.
80
62
76
81
63
    >>> print last_comment.parent['class']
77
    >>> print last_comment.parent['class']
82
64
    boardComment adminHiddenComment
78
    boardComment adminHiddenComment
83
79
84
80
Admin users can also reach the message via direct link, and it is
85
81
highlighted with the 'adminHiddenComment style there too.
86
82
87
83
    >>> admin_browser.open(
88
84
    ...     'http://bugs.launchpad.dev'
89
85
    ...     '/jokosher/+bug/11/comments/%d' % (int(latest_index[1:]) + 1))
90
86
    >>> contents = extract_text(admin_browser.contents)
91
87
    >>> print contents
92
88
    Comment #7 : Bug #11 ...
93
89
    This comment will not be visible when the test completes.
94
90
    ...
95
91
    >>> main_content = find_main_content(admin_browser.contents)
96
92
    >>> last_comment = main_content('div', 'boardCommentBody')[-1]
97
93
    >>> last_comment_text = extract_text(last_comment.div)
98
94
    >>> print last_comment.parent['class']
99
95
    boardComment adminHiddenComment
Reviewer	Review Type	Date Requested	Status
Deryck Hodge (community)	code		Approve on 2010-04-01
Abel Deuring		2010-04-01	Pending
Review via email: mp+22647@code.launchpad.net