Merge lp://qastaging/~salgado/offspring/project-ssh-key-ui into lp://qastaging/offspring
Proposed by
Guilherme Salgado
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~salgado/offspring/project-ssh-key-ui |
| Merge into: | lp://qastaging/offspring |
| Prerequisite: | lp://qastaging/~salgado/offspring/private-project-requires-owner |
| Diff against target: |
722 lines (+488/-36) 10 files modified
lib/offspring/web/media/js/jquery.placeholder.js (+106/-0) lib/offspring/web/queuemanager/admin.py (+5/-3) lib/offspring/web/queuemanager/forms.py (+35/-6) lib/offspring/web/queuemanager/models.py (+38/-4) lib/offspring/web/queuemanager/tests/test_views.py (+112/-1) lib/offspring/web/queuemanager/views.py (+46/-2) lib/offspring/web/templates/queuemanager/project_create.html (+58/-18) lib/offspring/web/templates/queuemanager/project_edit.html (+16/-2) lib/offspring/web/templates/queuemanager/project_edit_credentials.html (+70/-0) lib/offspring/web/urls.py (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~salgado/offspring/project-ssh-key-ui |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| CE Infrastructure | Pending | ||
| Offspring Committers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch adds the UI for setting the private SSH key and LP user ID. It uses a jquery plugin to display some help text inside a text area. Because of that it uses also the jquery that is included in Django (for the admin UI).
Also, the view code is not as simple as I'd like because we want to hide the SSH key when a user comes to the +editcredentials page after a key was set.
To post a comment you must log in.
Unmerged revisions
- 119. By Guilherme Salgado
-
merge trunk
- 118. By Guilherme Salgado
-
Merge trunk
- 117. By Guilherme Salgado
-
Make it possible to set per-project SSH key and LP user to use when fetching private branches from Launchpad
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
