Merge lp://qastaging/~registry/horizon/swift-support into lp://qastaging/~hudson-openstack/horizon/trunk
Proposed by
Tres Henry
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~registry/horizon/swift-support |
| Merge into: | lp://qastaging/~hudson-openstack/horizon/trunk |
| Diff against target: |
1221 lines (+924/-57) 30 files modified
.bzrignore (+1/-0) django-openstack/src/django_openstack/nova/urls/project.py (+3/-0) django-openstack/src/django_openstack/nova/views/projects.py (+12/-0) django-openstack/src/django_openstack/swift/exceptions.py (+14/-0) django-openstack/src/django_openstack/swift/forms.py (+16/-0) django-openstack/src/django_openstack/swift/manager.py (+85/-0) django-openstack/src/django_openstack/swift/shortcuts.py (+31/-0) django-openstack/src/django_openstack/swift/templatetags/swift_project_tags.py (+23/-0) django-openstack/src/django_openstack/swift/tests.py (+44/-0) django-openstack/src/django_openstack/swift/urls/project.py (+38/-0) django-openstack/src/django_openstack/swift/views/containers.py (+84/-0) django-openstack/src/django_openstack/swift/views/objects.py (+95/-0) django-openstack/src/django_openstack/swift/views/projects.py (+32/-0) django-openstack/src/django_openstack/templates/django_openstack/nova/index.html (+39/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/base.html (+40/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/containers/_create_form.html (+5/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/containers/_list.html (+32/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/containers/base.html (+8/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/containers/index.html (+69/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/index.html (+40/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/objects/_list.html (+33/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/objects/index.html (+74/-0) django-openstack/src/django_openstack/templates/django_openstack/swift/projects/index.html (+15/-0) openstack-dashboard/dashboard/settings.py (+1/-0) openstack-dashboard/dashboard/templates/index.html (+25/-32) openstack-dashboard/dashboard/urls.py (+4/-0) openstack-dashboard/dashboard/views.py (+10/-12) openstack-dashboard/local/local_settings.py.example (+6/-5) openstack-dashboard/media/dashboard/css/openstack.css (+44/-8) openstack-dashboard/tools/pip-requires (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~registry/horizon/swift-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Devin Carlen | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
It's not perfect but it's a start at Swift support in the dashboard. This does not include Keystone which needs to happen before this is real.
To post a comment you must log in.
Unmerged revisions
- 64. By Tres Henry
-
removing extra settings file
- 63. By Tres Henry
-
Swift can now be turned on or off based on INSTALLED_APPS.
- 62. By Tres Henry
-
Added some logging and better exception handling. And some pep8 cleanup.
- 61. By Tres Henry
-
basic swift functionality works. creds hard coded. lots of todos. needs better exception handling and logging.
- 60. By Tres Henry
-
Merge trunk rev: 61. Loc support.
- 59. By Tres Henry
-
start at swift support, much more to go, need to merge loc stuff from trunk
- 58. By Tres Henry
-
Merge from trunk rev: 60
- 57. By Michael Szilagyi
-
Removed swift dependancy on openstack-
dashboard/ index.html - 56. By Tres Henry
-
Merge trunk revno: 56
- 55. By Tres Henry <tres@ubuntu.(none)>
-
Removing need to define SWIFT_AUTHURL in settings.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
A few nits:
457 +from django_
And on comments, prefer this method:
# NOTE(myusername): etc etc
Use full namespace here:
268 +from manager import SwiftManager
a la
from django_