← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/projectgroupseries-projectgroup into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/projectgroupseries-projectgroup into lp:launchpad.

Commit message:
Rename ProjectGroupSeries.project to ProjectGroupSeries.projectgroup.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #523054 in Launchpad itself: "Rename Product.project to Product.projectgroup"
  https://bugs.launchpad.net/launchpad/+bug/523054

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/projectgroupseries-projectgroup/+merge/247957

Rename ProjectGroupSeries.project to ProjectGroupSeries.projectgroup.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/projectgroupseries-projectgroup into lp:launchpad.
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2014-12-06 00:16:55 +0000
+++ lib/lp/registry/browser/configure.zcml	2015-01-29 10:36:28 +0000
@@ -446,7 +446,7 @@
     <browser:url
         for="lp.registry.interfaces.projectgroup.IProjectGroupSeries"
         path_expression="string:+series/${name}"
-        attribute_to_parent="project"/>
+        attribute_to_parent="projectgroup"/>
     <browser:menus
         classes="
             ProjectActionMenu

=== modified file 'lib/lp/registry/interfaces/projectgroup.py'
--- lib/lp/registry/interfaces/projectgroup.py	2014-11-17 18:36:16 +0000
+++ lib/lp/registry/interfaces/projectgroup.py	2015-01-29 10:36:28 +0000
@@ -420,8 +420,8 @@
     """Interface for ProjectGroupSeries.
 
     This class provides the specifications related to a "virtual project
-    series", i.e., to those specifactions that are assigned to a series
-    of a product which is part of this project.
+    group series", i.e., to those specifications that are assigned to a
+    series of a product which is part of this project group.
     """
     name = TextLine(title=u'The name of the product series.',
                     required=True, readonly=True,
@@ -434,6 +434,7 @@
     title = TextLine(title=u'The title for this project series.',
                      required=True, readonly=True)
 
-    project = Object(schema=IProjectGroup,
-                     title=u"The project this series belongs to",
-                     required=True, readonly=True)
+    projectgroup = Object(
+        schema=IProjectGroup,
+        title=u"The project group this series belongs to",
+        required=True, readonly=True)

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2015-01-29 08:50:38 +0000
+++ lib/lp/registry/model/projectgroup.py	2015-01-29 10:36:28 +0000
@@ -613,20 +613,20 @@
 
     implements(IProjectGroupSeries)
 
-    def __init__(self, project, name):
-        self.project = project
+    def __init__(self, projectgroup, name):
+        self.projectgroup = projectgroup
         self.name = name
 
     def specifications(self, user, sort=None, quantity=None, filter=None,
                        need_people=True, need_branches=True,
                        need_workitems=False):
-        return self.project.specifications(
+        return self.projectgroup.specifications(
             user, sort, quantity, filter, self.name, need_people=need_people,
             need_branches=need_branches, need_workitems=need_workitems)
 
     @property
     def title(self):
-        return "%s Series %s" % (self.project.title, self.name)
+        return "%s Series %s" % (self.projectgroup.title, self.name)
 
     @property
     def displayname(self):


Follow ups