Merge lp:~thekorn/launchpad/fix-tagcombinator-517570 into lp:launchpad

[Markus Korn]

Added tags_combinator field to IPersonBugTaskSearch to fix (LP: #517570)

[Markus Korn (thekorn)]

= Summary =

Fix for bug 517570 to make tag_combinator.ALL work again on users bug lists

== Proposed fix ==

Add tags_combinator field to IPersonBugTaskSearch

== Tests ==

% bin/test -vvct xx-searching-by-tags

== Launchpad lint ==

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/bugs/interfaces/bugtask.py
  lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve (code)

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-02-01 22:47:12 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-02-05 16:36:26 +0000
@@ -823,6 +823,11 @@
         vocabulary='SourcePackageName')
     distribution = Choice(
         title=_("Distribution"), required=False, vocabulary='Distribution')
+    tags_combinator = Choice(
+        title=_("Tags combination"),
+        description=_("Search for any or all of the tags specified."),
+        vocabulary=BugTagsSearchCombinator, required=False,
+        default=BugTagsSearchCombinator.ANY)
 
 
 class IUpstreamProductBugTaskSearch(IBugTaskSearch):

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-01-23 14:17:49 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-02-05 16:36:26 +0000
@@ -14,7 +14,7 @@
 
     >>> login("[e-mail]")
     >>> firefox = getUtility(IProductSet).get(4)
-    >>> foobar = getUtility(IPersonSet).get(16)
+    >>> foobar = getUtility(IPersonSet).getByName("name16")
 
 The first bug is tagged with both 'test-tag-1' and 'test-tag-2'.
 
@@ -45,6 +45,19 @@
     Summary        Importance  Status   Heat
     16 test bug a  Undecided   New
     17 test bug b  Undecided   New
+    
+Same works for user related bugs:
+
+    >>> anon_browser.open('http://launchpad.dev/~name16/+bugs?advanced=1')
+    >>> anon_browser.getControl(
+    ...     name='field.tag').value = 'test-tag-1 test-tag-2'
+    >>> anon_browser.getControl(name='field.tags_combinator').value = ['ANY']
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print extract_text(
+    ...     find_tag_by_id(anon_browser.contents, 'buglisting'))
+    Summary        In               Importance  Status
+    16 test bug a  Mozilla Firefox  Undecided   New
+    17 test bug b  Mozilla Firefox  Undecided   New
 
 When we search for bugs with all the tags, though, only the first bug is
 returned, since it's the only bug with both tags.
@@ -58,3 +71,15 @@
     ...     find_tag_by_id(anon_browser.contents, 'buglisting'))
     Summary        Importance  Status   Heat
     16 test bug a  Undecided   New
+
+And also for user related bugs:
+
+    >>> anon_browser.open('http://launchpad.dev/~name16/+bugs?advanced=1')
+    >>> anon_browser.getControl(
+    ...     name='field.tag').value = 'test-tag-1 test-tag-2'
+    >>> anon_browser.getControl(name='field.tags_combinator').value = ['ALL']
+    >>> anon_browser.getControl('Search', index=1).click()
+    >>> print extract_text(
+    ...     find_tag_by_id(anon_browser.contents, 'buglisting'))
+    Summary        In               Importance  Status
+    16 test bug a  Mozilla Firefox  Undecided   New