← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/launchpad/sub-search-ui-bug-656823-7 into lp:launchpad

 

Gavin Panella has proposed merging lp:~allenap/launchpad/sub-search-ui-bug-656823-7 into lp:launchpad with lp:~allenap/launchpad/sub-search-ui-bug-656823-6 as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #656823 Subscribing to a search lacks a UI
  https://bugs.launchpad.net/bugs/656823

For more details, see:
https://code.launchpad.net/~allenap/launchpad/sub-search-ui-bug-656823-7/+merge/46249

Fixes the description of a bug subscription filter that has no conditions.

A filter without conditions actually allows all mail through, not no mail through as previously claimed. This is actually a good thing; it means that someone creating their first bug filter doesn't suddenly have all mail stopped.
-- 
https://code.launchpad.net/~allenap/launchpad/sub-search-ui-bug-656823-7/+merge/46249
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/sub-search-ui-bug-656823-7 into lp:launchpad.
=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py'
--- lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py	2011-01-14 11:07:18 +0000
+++ lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py	2011-01-14 11:07:19 +0000
@@ -307,7 +307,7 @@
         # description is very simple, and there's a short message describing
         # the absense of conditions.
         self.assertRender(
-            u"This filter does not allow mail through.",
+            u"This filter allows all mail through.",
             u"There are no filter conditions!")
 
     def test_render_with_no_description_and_conditions(self):
@@ -335,7 +335,7 @@
         with person_logged_in(self.owner):
             self.subscription_filter.description = u"The Wait"
         self.assertRender(
-            u"\u201cThe Wait\u201d does not allow mail through.",
+            u"\u201cThe Wait\u201d allows all mail through.",
             u"There are no filter conditions!")
 
     def test_render_with_description_and_conditions(self):

=== modified file 'lib/lp/bugs/templates/bug-subscription-filter.pt'
--- lib/lp/bugs/templates/bug-subscription-filter.pt	2011-01-14 11:07:18 +0000
+++ lib/lp/bugs/templates/bug-subscription-filter.pt	2011-01-14 11:07:19 +0000
@@ -17,7 +17,7 @@
       allows mail through when:
     </span>
     <span tal:condition="not:conditions">
-      does not allow mail through.
+      allows all mail through.
     </span>
   </dt>
   <dd tal:condition="conditions">