Merge lp:~cjohnston/launchpad/part-essential into lp:launchpad

[Chris Johnston]

Change to the wording of a blueprints participation essential to reflect changes that landed in Summit.

This changes the wording for participation essential of a blueprint to remove the part of the text that states that the scheduler will try to work around the persons availability. This has been changed in Summit to where a user will no longer be marked as required due to too much spam of people marking themselves required when they aren't actually required.

[Robert Collins (lifeless)]

Wait, so it won't be used at all? Why not remove the option entirely then?

[Curtis Hovey (sinzui)]

The permission-level change to launchpad.Admin has no effect because the definition of who can make the change has not changed. Project drivers, blueprint goal drivers, the subscriber, and the people working on the blueprint can edit the essential flag.

[Curtis Hovey (sinzui)]

thank you.

review: Approve (code)

[Curtis Hovey (sinzui)]

The proper way to balance the parens was to add back the one at the start of the OR clause instead of removing the one for isOneOf(). I will fix this now.

=== modified file 'lib/lp/blueprints/stories/standalone/subscribing.txt'
--- lib/lp/blueprints/stories/standalone/subscribing.txt	2011-12-23 22:27:40 +0000
+++ lib/lp/blueprints/stories/standalone/subscribing.txt	2012-09-17 23:49:19 +0000
@@ -38,16 +38,6 @@
     >>> back_link.url
     'http://blueprints.launchpad.dev/firefox/+spec/e4x'
 
-There should be a control to set whether or not participation in
-discussions of this feature is essential. We will say we want to be
-essential to this feature planning:
-
-    >>> essential = browser.getControl('essential')
-    >>> essential.selected
-    False
-
-    >>> essential.selected = True
-
 Now, we'll POST the form. We should see a message that we have just
 subscribed.
 
@@ -55,7 +45,7 @@
     >>> 'You have subscribed to this blueprint' in browser.contents
     True
 
-    >>> 'subscriber-essential' in browser.contents
+    >>> 'subscriber-inessential' in browser.contents
     True
 
 Now the link should say "Update subscription" in the actions menu.
@@ -64,53 +54,6 @@
     >>> submod_link is not None
     True
 
-OK. Now, let's say we want to change the essential field. Let's follow
-the link to modify the subscription. It should currently be checked.
-
-    >>> submod_link.click()
-    >>> essential = browser.getControl('essential')
-    >>> essential.selected
-    True
-
-We will unset the essential flag and resubmit:
-
-    >>> essential.selected = False
-    >>> browser.getControl('Change').click()
-    >>> 'Your subscription has been updated' in browser.contents
-    True
-
-    >>> 'subscriber-inessential' in browser.contents
-    True
-
-It's also possible to change the essential flag clicking on the star
-icon in the Subscribers portlet.
-
-    >>> browser.getLink(url='/+subscription/carlos').click()
-    >>> browser.getControl('Participation essential').selected = True
-    >>> browser.getControl('Change').click()
-    >>> browser.url
-    'http://blueprints.launchpad.dev/firefox/+spec/e4x'
-
-    >>> 'subscriber-essential' in browser.contents
-    True
-
-We don't really want to be subscribed, so lets unsubscribe from that
-spec. We click the remove icon in the subscribers list, and now the
-unsubscribe confirmation page loads.
-
-    >>> unsubit = browser.getLink(id='unsubscribe-subscriber-13')
-    >>> unsubit.click()
-    >>> confirm = browser.getControl('Unsubscribe')
-    >>> confirm.click()
-    >>> 'You have unsubscribed from this blueprint.' in browser.contents
-    True
-
-    >>> 'subscriber-inessential' in browser.contents
-    False
-
-    >>> 'subscriber-essential' in browser.contents
-    False
-
 
 Subscribing other users
 -----------------------
@@ -165,6 +108,7 @@
     ...     img = a_tags[0].first('img')
     ...     print img['src'],
     ...     print a_tags[1].string
+    /@@/subscriber-inessential Carlos ...
     /@@/subscriber-essential Stuart Bishop
 
 When we change a user's subscription, they get notified by email. Teams
@@ -190,6 +134,7 @@
     ...     img = a_tags[0].first('img')
     ...     print img['src'],
     ...     print a_tags[1].string
+    /@@/subscriber-inessential Carlos ...
     /@@/subscriber-inessential Stuart Bishop
 
 And check the email notification too.
 
=== modified file 'lib/lp/security.py'
--- lib/lp/security.py	2012-09-07 20:33:10 +0000
+++ lib/lp/security.py	2012-09-17 23:49:19 +0000
@@ -640,8 +640,8 @@
 
 
 class EditSpecificationSubscription(AuthorizationBase):
-    """The subscriber, and people related to the spec or the target of the
-    spec can determine who is essential."""
+    """The people related to the spec or the target of the
+    spec who can determine who is essential."""
     permission = 'launchpad.Edit'
     usedfor = ISpecificationSubscription
 
@@ -652,10 +652,9 @@
         else:
             if user.isOneOfDrivers(self.obj.specification.target):
                 return True
-        return (user.inTeam(self.obj.person) or
-                user.isOneOf(
+        return user.isOneOf(
                     self.obj.specification,
-                    ['owner', 'drafter', 'assignee', 'approver']) or
+                    ['owner', 'drafter', 'assignee', 'approver'] or
                 user.in_admin)