Merge lp:~allenap/launchpad/show-me-too-counts into lp:launchpad

[Gavin Panella]

[Gavin Panella (allenap)]

This branch does two things: shows the count of users affected by a
bug (previously this has not been shown), and moves the "Does this bug
affect you" line to above the bug task table.

Lint free.

To test:

  bin/test -vvct 'test_bugtask|xx-bug-affects-me-too'
  bin/test -vvct test_bug_me_too.py --layer BugsWindmillLayer
  firefox lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html

File by file:

lib/canonical/launchpad/javascript/bugs/bugtask-index.js

  Pass a new argument, others_affected_count, into the
  MeTooChoiceSource constructor. Accept it too :)

  New method, _getNewSourceNames(), that figures out the strings that
  will be used in the page to represent the current state of the
  choice source in the page. The results of this are used to override
  the defaults in the choice source's "items" array.

lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js

  Test the above.

lib/lp/bugs/browser/bugtask.py

  New property BugTasksAndNominationsView.other_users_affected_count
  which returns the number of users affected by the current bug
  *excluding* the logged-in user, if he/she is affected.

  New property BugTasksAndNominationsView.affected_statement, which
  returns a sentence or two to describe what the current state is. It
  takes into consideration whether or not the current user has voted
  either way or not, and also how many other users are affected.

lib/lp/bugs/browser/tests/test_bugtask.py

  Test the above.

lib/lp/bugs/stories/bugs/xx-bug-affects-me-too.txt

  The affected_statement is used for both clients with and without
  Javascript enabled, so this pagetest was updated.

lib/lp/bugs/templates/bugtasks-and-nominations-table.pt

  Move the me-too widget to above the task table. Apart from that
  there are very few changes. The affected_statement replaces the
  static text in the static and dynamic parts of the supporting HTML,
  and other_users_affected_count is passed into setup_me_too().

lib/lp/bugs/windmill/tests/test_bug_me_too.py

  Windmill test updated to reflect wording changes.

[Michael Nelson (michael.nelson)]

> This branch does two things: shows the count of users affected by a
> bug (previously this has not been shown), and moves the "Does this bug
> affect you" line to above the bug task table.

Wow - that's really nice Gavin, especially the way you've ensure the language is very natural in every situation! (eg. "This bug affects you and 3 other people" versus "This bug affects 3 people, but not you")

We chatted about included the count for anon users:

<noodles775> allenap: wow, that feature is great!
<noodles775> allenap: I was wondering whether there was a decision behind *not* displaying the count for anon users?
<allenap> noodles775: No deliberate decision, just didn't actually think about it, doh.
<allenap> noodles775: I should probably add it!
<noodles775> allenap: that'd be great!
<allenap> noodles775: I'll make it simply say "This bug affects 27 people".
<noodles775> Perfect

review: Approve (ui)

[Gavin Panella (allenap)]

Thanks for the UI review Michael! I've implemented that. It now says
"This bug affects 1 person" or "This bug affects x people" when x > 1.
If no one is affected, nothing is shown and there's no extraneous
white-space left in its wake.

I've attached a diff of the changes, though perhaps that's more for
the benefit of the code and js reviewer.

[Gavin Panella (allenap)]

The cover letter needs some additional information:

lib/lp/bugs/browser/bugtask.py

  New property anon_affected_statement which is shown to anonymous
  users. Explains how many people are affected by the bug.

lib/lp/bugs/stories/bugs/xx-bug-affects-me-too.txt

  Tests added for the template changes below.

lib/lp/bugs/templates/bugtasks-and-nominations-table.pt

  A simple statement about the number of affected users is now shown
  to anonymous users.

[Abel Deuring (adeuring)]

Wow, like Michael, I am really impressed by the effort you put into proper wording for the different cases if the current user is affected or not, iand how many other users are affected!

Thanks for the additional "normalisation", as dicussed on IRC:

(18:20:33) abel: allenap: shouldn't _getNewSourceNames() also be able to deal with others_affected_count == 0?
(18:21:41) allenap: abel: In that case it returns nothing. I'll add a comment to make that clear.
(18:23:13) abel: allenap: sure, is does nothing in this case. My question is: What will be displayed in this case?
(18:23:48) abel: allenap: ahm, now I got it...
(18:23:51) allenap: abel: The source_name values at around line 1552 in the same file.
(18:24:14) abel: allenap: thanks, sorry for being a bit confused today...
(18:24:25) allenap: abel: Perhaps I should change _getNewSourceNames to _getSourceNames and do it all from there?
(18:24:56) abel: allenap: right, I was thinking roughly in this direction too. sounds good

review: Approve (code)

[Gavin Panella (allenap)]

Thanks Abel!

I noticed (using LP_DEBUG_SQL=1) that the many references to current_user_affected_status were causing queries to be issued to the db. I had assumed these would be cached, because they're against the primary key. Anyway, it's not critical, but I have a branch - lp:~allenap/launchpad/is-user-affected-performance - to address it, and I'll get that landed tomorrow.

[Gavin Panella (allenap)]

Abel reviewed the Javascript already.

review: Abstain (js)

[Gavin Panella (allenap)]

Abel also approved revision 10039 on IRC, albeit in a version with white-space changes eliminated.

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-12-01 12:08:29 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-12-11 14:04:24 +0000
@@ -1495,7 +1495,7 @@
  *
  * @method setup_me_too
  */
-bugs.setup_me_too = function(user_is_affected) {
+bugs.setup_me_too = function(user_is_affected, others_affected_count) {
     // IE (7 & 8 tested) is stupid, stupid, stupid.
     if (Y.UA.ie) {
         return;
@@ -1504,7 +1504,8 @@
     var me_too_edit = new MeTooChoiceSource({
         contentBox: me_too_content, value: user_is_affected,
         elementToFlash: me_too_content,
-        editicon: ".dynamic img[src$=/@@/edit]"
+        editicon: ".dynamic img[src$=/@@/edit]",
+        others_affected_count: others_affected_count
     });
     me_too_edit.render();
 };
@@ -1547,12 +1548,10 @@
      */
     items: {
         value: [
-            { name: 'Yes, it affects me', value: true,
-              source_name: 'This bug affects me too',
-              disabled: false },
-            { name: "No, it doesn't affect me", value: false,
-              source_name: "This bug doesn't affect me",
-              disabled: false }
+            { name: 'Yes, it affects me',
+              value: true, disabled: false },
+            { name: "No, it doesn't affect me",
+              value: false, disabled: false }
         ]
     },
 
@@ -1572,6 +1571,16 @@
         set: function(v) {
             return Y.one(v);
         }
+    },
+
+    /**
+     * The number of other users currently affected by this bug.
+     *
+     * @attribute others_affected_count
+     * @type Number
+     */
+    others_affected_count: {
+        value: null
     }
 };
 
@@ -1588,6 +1597,50 @@
         this.error_handler.showError = function(error_msg) {
             widget.showError(error_msg);
         };
+        // Set source_names.
+        var others_affected_count = this.get('others_affected_count');
+        var source_names = this._getSourceNames(others_affected_count);
+        Y.each(this.get('items'), function(item) {
+            if (item.value in source_names) {
+                item.source_name = source_names[item.value];
+            }
+        });
+    },
+
+    /*
+     * The results of _getSourceNames() should closely mirror the
+     * results of BugTasksAndNominationsView.affected_statement and
+     * anon_affected_statement.
+     */
+    _getSourceNames: function(others_affected_count) {
+        var source_names = {};
+        // What to say when the user is marked as affected.
+        if (others_affected_count == 1) {
+            source_names[true] = (
+                'This bug affects you and 1 other person');
+        }
+        else if (others_affected_count > 1) {
+            source_names[true] = (
+                'This bug affects you and ' +
+                others_affected_count + ' other people');
+        }
+        else {
+            source_names[true] = 'This bug affects you';
+        }
+        // What to say when the user is marked as not affected.
+        if (others_affected_count == 1) {
+            source_names[false] = (
+                'This bug affects 1 person, but not you');
+        }
+        else if (others_affected_count > 1) {
+            source_names[false] = (
+                'This bug affects ' + others_affected_count +
+                ' people, but not you');
+        }
+        else {
+            source_names[false] = "This bug doesn't affect you";
+        }
+        return source_names;
     },
 
     showError: function(err) {
@@ -1742,7 +1795,8 @@
  * @method setup_add_attachment
  */
 function setup_add_attachment() {
-    var attachment_link = Y.one('.menu-link-addcomment');
+    // Find zero or more links to modify.
+    var attachment_link = Y.all('.menu-link-addcomment');
     attachment_link.on('click', function(e) {
         var comment_input = Y.one('[id="field.comment"]');
         if (comment_input.get('value') !== '') {
 
=== modified file 'lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js'
--- lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js	2009-12-02 16:23:42 +0000
+++ lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js	2009-12-11 14:04:24 +0000
@@ -72,7 +72,7 @@
         var me_too_content = Y.one('#affectsmetoo');
         this.config = {
             contentBox: me_too_content, value: null,
-            elementToFlash: me_too_content
+            elementToFlash: me_too_content, others_affected_count: 5
         };
         this.choice_edit = new Y.bugs._MeTooChoiceSource(this.config);
         this.choice_edit.render();
@@ -205,6 +205,39 @@
         Assert.isNull(
             edit_icon.get('src').match(/\/spinner$/),
             "The edit icon is displaying a spinner once the choice has been made.");
+    },
+
+    test__getSourceNames: function() {
+        var names;
+        // No other users affected.
+        names = this.choice_edit._getSourceNames(0);
+        Assert.areEqual(
+            'This bug affects you', names[true]);
+        Assert.areEqual(
+            "This bug doesn't affect you", names[false]);
+        // 1 other user affected.
+        names = this.choice_edit._getSourceNames(1);
+        Assert.areEqual(
+            'This bug affects you and 1 other person', names[true]);
+        Assert.areEqual(
+            'This bug affects 1 person, but not you', names[false]);
+        // 2 other users affected.
+        names = this.choice_edit._getSourceNames(2);
+        Assert.areEqual(
+            'This bug affects you and 2 other people', names[true]);
+        Assert.areEqual(
+            'This bug affects 2 people, but not you', names[false]);
+    },
+
+    test_new_names_are_applied: function() {
+        var names = {};
+        Y.each(this.choice_edit.get('items'), function(item) {
+            names[item.value] = item.source_name;
+        });
+        Assert.areEqual(
+            'This bug affects you and 5 other people', names[true]);
+        Assert.areEqual(
+            'This bug affects 5 people, but not you', names[false]);
     }
 
 }));
 
=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2009-11-28 08:11:20 +0000
+++ lib/lp/bugs/browser/bugtask.py	2009-12-11 14:04:24 +0000
@@ -3097,6 +3097,62 @@
         else:
             return 'false'
 
+    @property
+    def other_users_affected_count(self):
+        """The number of other users affected by this bug."""
+        if self.current_user_affected_status:
+            return self.context.users_affected_count - 1
+        else:
+            return self.context.users_affected_count
+
+    @property
+    def affected_statement(self):
+        """The default "this bug affects" statement to show.
+
+        The outputs of this method should be mirrored in
+        MeTooChoiceSource._getSourceNames() (Javascript).
+        """
+        if self.other_users_affected_count == 1:
+            if self.current_user_affected_status is None:
+                return "This bug affects 1 person. Does this bug affect you?"
+            elif self.current_user_affected_status:
+                return "This bug affects you and 1 other person"
+            else:
+                return "This bug affects 1 person, but not you"
+        elif self.other_users_affected_count > 1:
+            if self.current_user_affected_status is None:
+                return (
+                    "This bug affects %d people. Does this bug "
+                    "affect you?" % (self.other_users_affected_count))
+            elif self.current_user_affected_status:
+                return "This bug affects you and %d other people" % (
+                    self.other_users_affected_count)
+            else:
+                return "This bug affects %d people, but not you" % (
+                    self.other_users_affected_count)
+        else:
+            if self.current_user_affected_status is None:
+                return "Does this bug affect you?"
+            elif self.current_user_affected_status:
+                return "This bug affects you"
+            else:
+                return "This bug doesn't affect you"
+
+    @property
+    def anon_affected_statement(self):
+        """The "this bug affects" statement to show to anonymous users.
+
+        The outputs of this method should be mirrored in
+        MeTooChoiceSource._getSourceNames() (Javascript).
+        """
+        if self.context.users_affected_count == 1:
+            return "This bug affects 1 person"
+        elif self.context.users_affected_count > 1:
+            return "This bug affects %d people" % (
+                self.context.users_affected_count)
+        else:
+            return None
+
 
 class BugTaskTableRowView(LaunchpadView):
     """Browser class for rendering a bugtask row on the bug page."""
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2009-09-18 20:23:46 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2009-12-11 14:04:24 +0000
@@ -68,6 +68,142 @@
             self.bug.default_bugtask, False, False)
         self.failUnless(row_view.many_bugtasks)
 
+    def test_other_users_affected_count(self):
+        # The number of other users affected does not change when the
+        # logged-in user marked him or herself as affected or not.
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        self.view.context.markUserAffected(self.view.user, False)
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+
+    def test_other_users_affected_count_other_users(self):
+        # The number of other users affected only changes when other
+        # users mark themselves as affected.
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        other_user_1 = self.factory.makePerson()
+        self.view.context.markUserAffected(other_user_1, True)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+        other_user_2 = self.factory.makePerson()
+        self.view.context.markUserAffected(other_user_2, True)
+        self.failUnlessEqual(
+            3, self.view.other_users_affected_count)
+        self.view.context.markUserAffected(other_user_1, False)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+
+    def test_affected_statement_no_one_affected(self):
+        self.bug.markUserAffected(self.bug.owner, False)
+        self.failUnlessEqual(
+            0, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "Does this bug affect you?",
+            self.view.affected_statement)
+
+    def test_affected_statement_only_you(self):
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnless(self.bug.isUserAffected(self.view.user))
+        self.view.context.markUserAffected(self.bug.owner, False)
+        self.failUnlessEqual(
+            0, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects you",
+            self.view.affected_statement)
+
+    def test_affected_statement_only_not_you(self):
+        self.view.context.markUserAffected(self.view.user, False)
+        self.failIf(self.bug.isUserAffected(self.view.user))
+        self.view.context.markUserAffected(self.bug.owner, False)
+        self.failUnlessEqual(
+            0, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug doesn't affect you",
+            self.view.affected_statement)
+
+    def test_affected_statement_1_person_not_you(self):
+        self.assertIs(None, self.bug.isUserAffected(self.view.user))
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 1 person. Does this bug affect you?",
+            self.view.affected_statement)
+
+    def test_affected_statement_1_person_and_you(self):
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnless(self.bug.isUserAffected(self.view.user))
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects you and 1 other person",
+            self.view.affected_statement)
+
+    def test_affected_statement_1_person_and_not_you(self):
+        self.view.context.markUserAffected(self.view.user, False)
+        self.failIf(self.bug.isUserAffected(self.view.user))
+        self.failUnlessEqual(
+            1, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 1 person, but not you",
+            self.view.affected_statement)
+
+    def test_affected_statement_more_than_1_person_not_you(self):
+        self.assertIs(None, self.bug.isUserAffected(self.view.user))
+        other_user = self.factory.makePerson()
+        self.view.context.markUserAffected(other_user, True)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 2 people. Does this bug affect you?",
+            self.view.affected_statement)
+
+    def test_affected_statement_more_than_1_person_and_you(self):
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnless(self.bug.isUserAffected(self.view.user))
+        other_user = self.factory.makePerson()
+        self.view.context.markUserAffected(other_user, True)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects you and 2 other people",
+            self.view.affected_statement)
+
+    def test_affected_statement_more_than_1_person_and_not_you(self):
+        self.view.context.markUserAffected(self.view.user, False)
+        self.failIf(self.bug.isUserAffected(self.view.user))
+        other_user = self.factory.makePerson()
+        self.view.context.markUserAffected(other_user, True)
+        self.failUnlessEqual(
+            2, self.view.other_users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 2 people, but not you",
+            self.view.affected_statement)
+
+    def test_anon_affected_statement_no_one_affected(self):
+        self.bug.markUserAffected(self.bug.owner, False)
+        self.failUnlessEqual(0, self.bug.users_affected_count)
+        self.assertIs(None, self.view.anon_affected_statement)
+
+    def test_anon_affected_statement_1_user_affected(self):
+        self.failUnlessEqual(1, self.bug.users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 1 person",
+            self.view.anon_affected_statement)
+
+    def test_anon_affected_statement_2_users_affected(self):
+        self.view.context.markUserAffected(self.view.user, True)
+        self.failUnlessEqual(2, self.bug.users_affected_count)
+        self.failUnlessEqual(
+            "This bug affects 2 people",
+            self.view.anon_affected_statement)
+
 
 def test_suite():
     suite = unittest.TestSuite()
 
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-affects-me-too.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-affects-me-too.txt	2009-07-31 13:49:53 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-affects-me-too.txt	2009-12-11 14:04:24 +0000
@@ -10,13 +10,14 @@
    >>> logout()
 
 The user goes to the bug's index page, and finds a statement that the
-bug is not marked as affecting them.
+bug affects one other person (in this instance, the person who filed
+the bug).
 
    >>> user_browser.open(test_bug_url)
    >>> print extract_text(find_tag_by_id(
    ...     user_browser.contents, 'affectsmetoo').find(
    ...         None, 'static'))
-   This bug doesn't affect me
+   This bug affects 1 person. Does this bug affect you?
 
 Next to the statement is a link containing an edit icon.
 
@@ -45,7 +46,7 @@
    >>> print extract_text(find_tag_by_id(
    ...     user_browser.contents, 'affectsmetoo').find(
    ...         None, 'static'))
-   This bug affects me too
+   This bug affects you and 1 other person
 
 Next to it, we also see the 'hot bug' icon, to indicate that the user
 has marked the bug as affecting them.
@@ -69,7 +70,28 @@
    >>> print extract_text(find_tag_by_id(
    ...     user_browser.contents, 'affectsmetoo').find(
    ...         None, 'static'))
-   This bug doesn't affect me
+   This bug affects 1 person, but not you
+
+
+== Anonymous users ==
+
+Anonymous users just see the number of affected users.
+
+   >>> anon_browser.open(test_bug_url)
+   >>> print extract_text(find_tag_by_id(
+   ...     anon_browser.contents, 'affectsmetoo'))
+   This bug affects 1 person
+
+If no one is marked as affected by the bug, the message does not
+appear at all to anonymous users.
+
+   >>> login('[e-mail]')
+   >>> test_bug.markUserAffected(test_bug.owner, False)
+   >>> logout()
+
+   >>> anon_browser.open(test_bug_url)
+   >>> print find_tag_by_id(anon_browser.contents, 'affectsmetoo')
+   None
 
 
 == Static and dynamic support ==
 
=== modified file 'lib/lp/bugs/templates/bugtasks-and-nominations-table.pt'
--- lib/lp/bugs/templates/bugtasks-and-nominations-table.pt	2009-12-03 18:36:37 +0000
+++ lib/lp/bugs/templates/bugtasks-and-nominations-table.pt	2009-12-11 14:04:24 +0000
@@ -2,6 +2,63 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   omit-tag="">
+
+<tal:affects-me-too
+    tal:condition="view/displayAlsoAffectsLinks">
+  <tal:editable
+      condition="context/menu:context/affectsmetoo/enabled">
+    <div class="actions">
+      <span id="affectsmetoo" style="display: inline"
+            tal:define="affected view/current_user_affected_status">
+        <tal:comment condition="nothing">
+          This .static section is shown in browsers with javascript
+          enabled, and before setup_me_too is run.
+        </tal:comment>
+        <span class="static">
+          <tal:affected condition="affected">
+            <img width="14" height="14" src="/@@/flame-icon" alt="" />
+            <tal:statement replace="view/affected_statement" />
+          </tal:affected>
+          <tal:not-affected condition="not:affected">
+            <tal:statement replace="view/affected_statement" />
+          </tal:not-affected>
+          <a href="+affectsmetoo">
+            <img class="editicon" src="/@@/edit" alt="Edit" />
+          </a>
+        </span>
+        <tal:comment condition="nothing">
+          This .dynamic section is used by setup_me_too to display
+          controls and information in the correct places.
+        </tal:comment>
+        <span class="dynamic unseen">
+          <img src="/@@/flame-icon" alt=""/>
+          <a href="+affectsmetoo" class="js-action"
+             ><span class="value" tal:content="view/affected_statement" /></a>
+          <img class="editicon" src="/@@/edit" alt="Edit" />
+        </span>
+        <script type="text/javascript" tal:content="string:
+          LPS.use('event', 'bugs.bugtask_index', function(Y) {
+              Y.on('load', function(e) {
+                  Y.bugs.setup_me_too(
+                      ${view/current_user_affected_js_status},
+                      ${view/other_users_affected_count});
+              }, window);
+          });
+          ">
+        </script>
+      </span>
+    </div>
+  </tal:editable>
+  <tal:not-editable
+      condition="not:context/menu:context/affectsmetoo/enabled">
+    <div class="actions"
+         tal:define="statement view/anon_affected_statement"
+         tal:condition="statement">
+      <span id="affectsmetoo" style="display: inline" tal:content="statement" />
+    </div>
+  </tal:not-editable>
+</tal:affects-me-too>
+
 <script type="text/javascript">
   function toggleFormVisibility(row_id) {
     row = document.getElementById(row_id)
@@ -41,63 +98,21 @@
 <div class="actions"
      tal:define="current_bugtask view/current_bugtask"
      tal:condition="view/displayAlsoAffectsLinks">
-    <tal:also-affects-links define="context_menu context/menu:context">
-      <tal:addupstream
+  <tal:also-affects-links
+      define="context_menu context/menu:context">
+    <tal:addupstream
         define="link context_menu/addupstream"
         condition="link/enabled"
         replace="structure link/render" />
-      <tal:adddistro
+    <tal:adddistro
         define="link context_menu/adddistro"
         condition="link/enabled"
         replace="structure link/render" />
-      <tal:nominate
+    <tal:nominate
         define="link context_menu/nominate"
         condition="link/enabled"
         replace="structure link/render" />
-      <span id="affectsmetoo" style="display: inline"
-            tal:condition="link/enabled"
-            tal:define="link context_menu/affectsmetoo;
-                        affected view/current_user_affected_status">
-
-        <tal:comment condition="nothing">
-          This .static section is shown in browsers with javascript
-          enabled, and before setup_me_too is run.
-        </tal:comment>
-        <span class="static">
-          <tal:affected condition="affected">
-            <img width="14" height="14" src="/@@/flame-icon" alt="" />
-            This bug affects me too
-          </tal:affected>
-          <tal:not-affected condition="not:affected">
-            This bug doesn't affect me
-          </tal:not-affected>
-          <a href="+affectsmetoo">
-            <img class="editicon" src="/@@/edit" alt="Edit" />
-          </a>
-        </span>
-
-        <tal:comment condition="nothing">
-          This .dynamic section is used by setup_me_too to display
-          controls and information in the correct places.
-        </tal:comment>
-        <span class="dynamic unseen">
-          <img src="/@@/flame-icon" alt=""/>
-          <a href="+affectsmetoo" class="js-action"
-             ><span class="value">Does this bug affect you?</span></a>
-          <img class="editicon" src="/@@/edit" alt="Edit" />
-        </span>
-
-        <script type="text/javascript" tal:content="string:
-          LPS.use('event', 'bugs.bugtask_index', function(Y) {
-              Y.on('load', function(e) {
-                  Y.bugs.setup_me_too(${view/current_user_affected_js_status});
-              }, window);
-          });
-          ">
-        </script>
-
-      </span>
-    </tal:also-affects-links>
+  </tal:also-affects-links>
 </div>
 
 </tal:root>
 
=== modified file 'lib/lp/bugs/windmill/tests/test_bug_me_too.py'
--- lib/lp/bugs/windmill/tests/test_bug_me_too.py	2009-11-04 14:06:04 +0000
+++ lib/lp/bugs/windmill/tests/test_bug_me_too.py	2009-12-11 14:04:24 +0000
@@ -111,7 +111,7 @@
         def check_for_save_not_affects(client):
             client.asserts.assertText(
                 xpath=VALUE_LOCATION_XPATH,
-                validator=u"This bug doesn't affect me")
+                validator=u"This bug doesn't affect you")
 
         # Hah! But this bug does affect the logged-in user! The logged-in
         # user made a mistake, oh noes. Better fix that.
@@ -125,7 +125,7 @@
         def check_for_save_does_affect(client):
             client.asserts.assertText(
                 xpath=VALUE_LOCATION_XPATH,
-                validator=u"This bug affects me too")
+                validator=u"This bug affects you")
 
         # The flame icon is now visible.
         client.asserts.assertElemJS(