Merge lp:~kfogel/launchpad/471195-private-bug-body-class-private into lp:launchpad

[Karl Fogel]

Ensure that toggling a bug to "private" or "public" sets the bug's body class accordingly.

[Karl Fogel (kfogel)]

Ensure that toggling a bug to "private" or "public" sets the body class accordingly.
Also, test that the pre-existing code that sets the class on the privacy div works too.

[Eleanor Berger (intellectronica)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-02-16 16:29:36 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-03-09 18:42:29 +0000
@@ -525,14 +525,14 @@
                 lp_bug_entry = updated_entry;
 
                 if (private) {
-                    privacy_div.removeClass('public');
-                    privacy_div.addClass('private');
+                    Y.one('body').replaceClass('public', 'private');
+                    privacy_div.replaceClass('public', 'private');
                     privacy_text.set(
                         'innerHTML',
                         'This report is <strong>private</strong> ');
                 } else {
-                    privacy_div.removeClass('private');
-                    privacy_div.addClass('public');
+                    Y.one('body').replaceClass('private', 'public');
+                    privacy_div.replaceClass('private', 'public');
                     privacy_text.set(
                         'innerHTML', 'This report is public ');
                 }

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-03-06 21:38:23 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-03-09 18:42:29 +0000
@@ -540,7 +540,8 @@
 
     def public_private_css(self):
         """Return the CSS class that represents the object's privacy."""
-        if IPrivacy.providedBy(self._context) and self._context.private:
+        privacy = IPrivacy(self._context, None)
+        if privacy is not None and privacy.private:
             return 'private'
         else:
             return 'public'

=== modified file 'lib/lp/bugs/adapters/bug.py'
--- lib/lp/bugs/adapters/bug.py	2010-02-15 13:58:03 +0000
+++ lib/lp/bugs/adapters/bug.py	2010-03-09 18:42:29 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'bugcomment_to_entry',
+    'bugtask_to_privacy',
     ]
 
 from zope.component import getMultiAdapter
@@ -20,3 +21,10 @@
     """
     return getMultiAdapter(
         (comment.bugtask.bug.messages[comment.index], version), IEntry)
+
+def bugtask_to_privacy(bugtask):
+    """Adapt the bugtask to the underlying bug (which implements IPrivacy).
+
+    Needed because IBugTask does not implement IPrivacy.
+    """
+    return bugtask.bug

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-02-19 12:31:43 +0000
+++ lib/lp/bugs/configure.zcml	2010-03-09 18:42:29 +0000
@@ -265,6 +265,10 @@
             permission="zope.Public"/>
         <adapter
             for="lp.bugs.interfaces.bugtask.IBugTask"
+            provides="canonical.launchpad.interfaces.launchpad.IPrivacy"
+            factory="lp.bugs.adapters.bug.bugtask_to_privacy"/>
+        <adapter
+            for="lp.bugs.interfaces.bugtask.IBugTask"
             provides="canonical.launchpad.interfaces.IBug"
             factory="lp.bugs.model.bugtask.BugTaskToBugAdapter"/>
         <adapter

=== modified file 'lib/lp/bugs/windmill/tests/test_bug_privacy_settings.py'
--- lib/lp/bugs/windmill/tests/test_bug_privacy_settings.py	2010-02-18 10:51:34 +0000
+++ lib/lp/bugs/windmill/tests/test_bug_privacy_settings.py	2010-03-09 18:42:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import unittest
@@ -25,6 +25,11 @@
 PRIVACY_TEXT = u'privacy-text'
 PRIVACY_TEXT_STRONG = u'//div[@id="privacy-text"]/strong'
 SECURITY_MESSAGE = u'security-message'
+IS_PRIVATE_CLASS = (
+    u"(function() {var classes = element.getAttribute('class').split(' '); "
+    "return classes.indexOf('private') >= 0"
+    " && "
+    "classes.indexOf('public') < 0})()")
 
 
 class TestSecurityOverlay(WindmillTestCase):
@@ -79,6 +84,11 @@
         client.asserts.assertElemJS(
             xpath=MAIN_FORM_ELEMENT, js=FORM_NOT_VISIBLE)
 
+        # After the bug has been toggled to private, both the document
+        # as a whole and the privacy div have the class 'private' and
+        # do not have the class 'public'.
+        client.asserts.assertElemJS(id=u'document', js=IS_PRIVATE_CLASS)
+        client.asserts.assertElemJS(id=u'privacy', js=IS_PRIVATE_CLASS)
 
         # These text changes are made via Javascript, thus avoiding a
         # complete page load. Let's reload the page, to check that