Launchpad itself

Merge lp:~cjwatson/launchpad/structuralsubscription-projectgroup into lp:launchpad

  1. structuralsubscription-projectgroup
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: no longer in the source branch.
Merged at revision: 17317
Proposed branch: lp:~cjwatson/launchpad/structuralsubscription-projectgroup
Merge into: lp:launchpad
Diff against target: 98 lines (+11/-11)
5 files modified
lib/lp/bugs/browser/tests/test_structuralsubscription.py (+1/-1)
lib/lp/bugs/interfaces/structuralsubscription.py (+1/-1)
lib/lp/bugs/model/bugtasksearch.py (+1/-1)
lib/lp/bugs/model/structuralsubscription.py (+7/-7)
lib/lp/bugs/tests/test_structuralsubscriptiontarget.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/structuralsubscription-projectgroup
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+247956@code.launchpad.net

Commit message

Rename StructuralSubscription.project to StructuralSubscription.projectgroup.

Description of the change

Rename StructuralSubscription.project to StructuralSubscription.projectgroup.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/browser/tests/test_structuralsubscription.py'
2--- lib/lp/bugs/browser/tests/test_structuralsubscription.py 2012-01-01 02:58:52 +0000
3+++ lib/lp/bugs/browser/tests/test_structuralsubscription.py 2015-01-29 10:27:03 +0000
4@@ -110,7 +110,7 @@
5 self.navigation = MilestoneNavigation
6
7
8-class TestProjectStructuralSubscriptionTraversal(
9+class TestProjectGroupStructuralSubscriptionTraversal(
10 StructuralSubscriptionTraversalTestBase):
11 """Test IStructuralSubscription traversal from IProjectGroup."""
12
13
14=== modified file 'lib/lp/bugs/interfaces/structuralsubscription.py'
15--- lib/lp/bugs/interfaces/structuralsubscription.py 2013-01-07 02:40:55 +0000
16+++ lib/lp/bugs/interfaces/structuralsubscription.py 2015-01-29 10:27:03 +0000
17@@ -55,7 +55,7 @@
18 product = Int(title=_('Product'), required=False, readonly=True)
19 productseries = Int(
20 title=_('Product series'), required=False, readonly=True)
21- project = Int(title=_('Project group'), required=False, readonly=True)
22+ projectgroup = Int(title=_('Project group'), required=False, readonly=True)
23 milestone = Int(title=_('Milestone'), required=False, readonly=True)
24 distribution = Int(title=_('Distribution'), required=False, readonly=True)
25 distroseries = Int(
26
27=== modified file 'lib/lp/bugs/model/bugtasksearch.py'
28--- lib/lp/bugs/model/bugtasksearch.py 2015-01-28 15:35:18 +0000
29+++ lib/lp/bugs/model/bugtasksearch.py 2015-01-29 10:27:03 +0000
30@@ -531,7 +531,7 @@
31 BugTaskFlat.product_id,
32 Select(Product.id, tables=[SS, Product],
33 where=And(
34- SS.projectID == Product.projectID,
35+ SS.projectgroupID == Product.projectID,
36 projectgroup_match,
37 Product.active))))
38 extra_clauses.append(Or(*ss_clauses))
39
40=== modified file 'lib/lp/bugs/model/structuralsubscription.py'
41--- lib/lp/bugs/model/structuralsubscription.py 2013-06-20 05:50:00 +0000
42+++ lib/lp/bugs/model/structuralsubscription.py 2015-01-29 10:27:03 +0000
43@@ -105,8 +105,8 @@
44 productseriesID = Int("productseries", default=None)
45 productseries = Reference(productseriesID, "ProductSeries.id")
46
47- projectID = Int("project", default=None)
48- project = Reference(projectID, "ProjectGroup.id")
49+ projectgroupID = Int("project", default=None)
50+ projectgroup = Reference(projectgroupID, "ProjectGroup.id")
51
52 milestoneID = Int("milestone", default=None)
53 milestone = Reference(milestoneID, "Milestone.id")
54@@ -148,8 +148,8 @@
55 return self.product
56 elif self.productseries is not None:
57 return self.productseries
58- elif self.project is not None:
59- return self.project
60+ elif self.projectgroup is not None:
61+ return self.projectgroup
62 elif self.milestone is not None:
63 return self.milestone
64 elif self.distribution is not None:
65@@ -214,9 +214,9 @@
66 def __init__(self, target):
67 self.target = target
68 self.target_parent = None
69- self.target_arguments = {"project": target}
70+ self.target_arguments = {"projectgroup": target}
71 self.pillar = target
72- self.join = (StructuralSubscription.project == target)
73+ self.join = (StructuralSubscription.projectgroup == target)
74
75
76 class DistributionSourcePackageTargetHelper:
77@@ -274,7 +274,7 @@
78 if target.project is not None:
79 self.join = Or(
80 StructuralSubscription.product == target,
81- StructuralSubscription.project == target.project)
82+ StructuralSubscription.projectgroup == target.project)
83 else:
84 self.join = (
85 StructuralSubscription.product == target)
86
87=== modified file 'lib/lp/bugs/tests/test_structuralsubscriptiontarget.py'
88--- lib/lp/bugs/tests/test_structuralsubscriptiontarget.py 2012-12-26 01:32:19 +0000
89+++ lib/lp/bugs/tests/test_structuralsubscriptiontarget.py 2015-01-29 10:27:03 +0000
90@@ -332,7 +332,7 @@
91 self.assertEqual(target, helper.target)
92 self.assertEqual(None, helper.target_parent)
93 self.assertEqual(target, helper.pillar)
94- self.assertEqual({"project": target}, helper.target_arguments)
95+ self.assertEqual({"projectgroup": target}, helper.target_arguments)
96 self.assertEqual(
97 u"StructuralSubscription.project = ?",
98 compile_storm(helper.join))