Merge lp:~dhillon-v10/launchpad/fix-bug-410331 into lp:launchpad/db-devel

[Vikram Dhillon]

[Vikram Dhillon (dhillon-v10)]

Adding a default display name in the file lib/lp/soyuz/browser/archive.py

[Julian Edwards (julian-edwards)]

Hi

Thanks for working on the fix!

There are quite a few problems with this branch, I'll take you through what you need to change to get this branch accepted:

1. Remove the XXX line - we only add those if there's an outstanding issue. For regular bug fixes they're just irrelevant.
2. You've taken my suggested default too literally! We want to substitute the words in the displayname string and default to meaningful names.
3. The code you've written won't do anything for the first PPA activated, something that you'd have noticed if there were tests :)
4. There are no tests! You should examine the file at
lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt and particularly at around line 57 where it demonstrates that the name is pre-filled for the first PPA activated.

The logic for the pre-filled displayname should be something like:

If the name field has data in it:
    "PPA named <name> for <owner's name>"
else:
    "PPA for <owner's name>"

where <owner's name> is self.context.owner.displayname

Regards
Julian.

review: Resubmit (code)

[Vikram Dhillon (dhillon-v10)]

Julian, then something like this perhaps: (the spacing might not come out right)

if self.context.archive is not None:
         return { 'displayname' : "PPA named " + self.context.owner.name + "for " + self.context.owner.displayname}
else:
         return { 'displayname' : "PPA for " + self.context.owner.displayname}

[Vikram Dhillon (dhillon-v10)]

Or better yet, something like this:

if self.context.archive is not None:
         return { 'displayname' : "PPA named X for " + self.context.owner.displayname}
else:
         return { 'displayname' : "PPA for " + self.context.owner.displayname}

[lp:~dhillon-v10/launchpad/fix-bug-410331]

10287. By Vikram Dhillon on 2010-02-14

Removing the XXX line

10288. By Vikram Dhillon on 2010-02-14

New display name style for a ppa

10289. By Vikram Dhillon on 2010-03-14

Fixed the default ppa naming

Unmerged revisions

10289. By Vikram Dhillon on 2010-03-14

Fixed the default ppa naming

10288. By Vikram Dhillon on 2010-02-14

New display name style for a ppa

10287. By Vikram Dhillon on 2010-02-14

Removing the XXX line

10286. By Vikram Dhillon on 2010-02-08

Adding a default value to the display name when the ppa first activates.

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-02-11 13:26:21 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-02-14 05:02:21 +0000
@@ -1653,6 +1653,17 @@
         # first PPA activation.
         if self.context.archive is None:
             return {'name': 'ppa'}
+
+        #  Suggest a default value of "PPA name" the ppa name "for" their
+        #  name
+        if self.context.archive is not None:
+            return { 'displayname' : "PPA named " + self.context.archive.name + 
+            " for " + self.context.owner.displayname}
+       # Or something like "PPA named X for " +       
+       # self.context.owner.displayname     
+        else:
+            return { 'displayname' : "PPA for " + self.context.owner.displayname}
+
         return {}
 
     def setUpFields(self):