Merge lp:~brian-murray/launchpad/api-export-person-logo_link into lp:launchpad

Proposed by Brian Murray
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~brian-murray/launchpad/api-export-person-logo_link
Merge into: lp:launchpad
Diff against target: 47 lines (+11/-8)
2 files modified
lib/lp/registry/interfaces/person.py (+9/-8)
lib/lp/registry/stories/webservice/xx-person.txt (+2/-0)
To merge this branch: bzr merge lp:~brian-murray/launchpad/api-export-person-logo_link
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) code Approve
Review via email: mp+20074@code.launchpad.net

Commit message

Export Person.logo in the API.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This exports logo for people and team's in the API.

Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Can't think of anything that could go wrong, except perhaps tests breaking—and our process will catch that.

Thanks for the fix!

review: Approve (code)
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

I just kicked off an "ec2 land" for this branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py 2010-02-08 14:37:50 +0000
+++ lib/lp/registry/interfaces/person.py 2010-02-24 17:36:33 +0000
@@ -508,14 +508,15 @@
508 "in listings of bugs or on a person's membership table."))508 "in listings of bugs or on a person's membership table."))
509 iconID = Int(title=_('Icon ID'), required=True, readonly=True)509 iconID = Int(title=_('Icon ID'), required=True, readonly=True)
510510
511 logo = LogoImageUpload(511 logo = exported(
512 title=_("Logo"), required=False,512 LogoImageUpload(
513 default_image_resource='/@@/person-logo',513 title=_("Logo"), required=False,
514 description=_(514 default_image_resource='/@@/person-logo',
515 "An image of exactly 64x64 pixels that will be displayed in "515 description=_(
516 "the heading of all pages related to you. Traditionally this "516 "An image of exactly 64x64 pixels that will be displayed in "
517 "is a logo, a small picture or a personal mascot. It should be "517 "the heading of all pages related to you. Traditionally this "
518 "no bigger than 50kb in size."))518 "is a logo, a small picture or a personal mascot. It should be "
519 "no bigger than 50kb in size.")))
519 logoID = Int(title=_('Logo ID'), required=True, readonly=True)520 logoID = Int(title=_('Logo ID'), required=True, readonly=True)
520521
521 mugshot = exported(MugshotImageUpload(522 mugshot = exported(MugshotImageUpload(
522523
=== modified file 'lib/lp/registry/stories/webservice/xx-person.txt'
--- lib/lp/registry/stories/webservice/xx-person.txt 2010-02-05 09:02:39 +0000
+++ lib/lp/registry/stories/webservice/xx-person.txt 2010-02-24 17:36:33 +0000
@@ -28,6 +28,7 @@
28 karma: 028 karma: 0
29 languages_collection_link: u'http://.../~salgado/languages'29 languages_collection_link: u'http://.../~salgado/languages'
30 latitude: None30 latitude: None
31 logo_link: u'http://.../~salgado/logo'
31 longitude: None32 longitude: None
32 mailing_list_auto_subscribe_policy: u'Ask me when I join a team'33 mailing_list_auto_subscribe_policy: u'Ask me when I join a team'
33 members_collection_link: u'http://.../~salgado/members'34 members_collection_link: u'http://.../~salgado/members'
@@ -74,6 +75,7 @@
74 karma: 075 karma: 0
75 languages_collection_link: u'http://.../~ubuntu-team/languages'76 languages_collection_link: u'http://.../~ubuntu-team/languages'
76 latitude: None77 latitude: None
78 logo_link: u'http://.../~ubuntu-team/logo'
77 longitude: None79 longitude: None
78 mailing_list_auto_subscribe_policy: u'Ask me when I join a team'80 mailing_list_auto_subscribe_policy: u'Ask me when I join a team'
79 members_collection_link: u'http://.../~ubuntu-team/members'81 members_collection_link: u'http://.../~ubuntu-team/members'