Merge lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0 into lp://staging/developer-ubuntu-com

Proposed by David Callé
Status: Merged
Approved by: Michael Hall
Approved revision: 111
Merged at revision: 92
Proposed branch: lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0
Merge into: lp://staging/developer-ubuntu-com
Diff against target: 614 lines (+378/-22) (has conflicts)
17 files modified
developer_portal/management/commands/update-template.py (+2/-1)
developer_portal/settings.py (+3/-1)
developer_portal/static/developer_portal/css/devportal.css (+38/-0)
developer_portal/urls.py (+3/-0)
developer_portal/views.py (+6/-3)
locale/developer_portal.pot (+112/-16)
locale/zh_CN.po (+11/-0)
templates/webapp.html (+17/-0)
templates/website_base.html (+1/-1)
webapp_creator/admin.py (+3/-0)
webapp_creator/models.py (+2/-0)
webapp_creator/resources/appname.apparmor (+13/-0)
webapp_creator/resources/appname.desktop (+10/-0)
webapp_creator/resources/manifest.json (+7/-0)
webapp_creator/tests.py (+3/-0)
webapp_creator/views.py (+64/-0)
webapp_creator/woc.py (+83/-0)
Text conflict in locale/zh_CN.po
To merge this branch: bzr merge lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0
Reviewer Review Type Date Requested Status
David Planella Needs Fixing
David Callé Needs Fixing
Review via email: mp+252991@code.staging.launchpad.net

Commit message

Description of the change

To post a comment you must log in.
Revision history for this message
David Callé (davidc3) wrote :

Remaining issue: It appears that the csrf setting (l90 on developer_portal/settings.py) breaks the form submission.

review: Needs Fixing
Revision history for this message
Michael Hall (mhall119) wrote :

We need to put this page behind an Ubuntu SSO login, that will both limit abuse as well as fix your CSRF issue.

Revision history for this message
Michael Hall (mhall119) wrote :

Adding the @login_required decorator to the webapp view function should do the trick.

https://docs.djangoproject.com/en/1.6/topics/auth/default/#the-login-required-decorator

Revision history for this message
David Planella (dpm) wrote :

Good work!

Just a few nitpicks. I'm mentioning them to make sure all the text messages are correct before sending them to translators:

- In all 4 cases "eg." should be "E.g."
- On the "Maintainer email" label, "email" should be "e-mail"
- "PNG" should be capital letters

Just a suggestion, but it might be worth adding an explicit example of the developer namespace, so that if developers don't exactly know what that is, they don't have to leave the generator to click on the MyApps link. E.g.:

"The namespace you picked for your MyApps account. E.g. com.ubuntu.developer.miaotian" (perhaps it can be shortened to fit into one line of text)

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :

Correction on my last comment: the developer namespace is just the user name. So:

"The namespace you picked for your MyApps account. E.g. miaotian"

Revision history for this message
David Planella (dpm) wrote :

While testing the branch, I realized I had to apply Mike's fix anyway, so rather than both of us having to apply it, I went ahead and proposed it in another MP so that it's easier for you to merge.

I've also put the spelling fixes in.

Here it is:
https://code.launchpad.net/~dpm/developer-ubuntu-com/webapp-generator-fixes/+merge/253020

Revision history for this message
David Callé (davidc3) wrote :

Oh, I haven't seen your branch before pushing, sorry :)

Revision history for this message
David Callé (davidc3) wrote :

For what it's worth, I've set the branch owner to ~ubuntudeveloperportal, so you should be able to push to it directly if you want to.

Revision history for this message
David Planella (dpm) wrote :

Ok, I've added some more changes related to translations fixes. I'll push to this branch, then.

Revision history for this message
David Planella (dpm) wrote :

Ok, pushed fixes, let me know what you think.

Note: pep8 is not too happy with the long line on the webapps views, but I could not think of any other way of making it translator-friendly (using backspaces for the string added all the whitespace to the message in the .pot file)

pep8 webapp_creator/views.py

Revision history for this message
David Planella (dpm) wrote :

Thanks for the fix to the long string! Simplified Chinese translations are now on their way.

I've just added an inline comment, it does not need fixing, just a suggestion to see what you think.

110. By David Planella

Updated Simplified Chinese translations for the webapp generator

Revision history for this message
David Planella (dpm) wrote :

Simplified Chinese translations are now in the branch.

111. By David Callé

Allow for non-lp SSO

112. By David Callé

Make click call compatible with 0.4.21.1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches