diff options
| author | Julie Pichon <jpichon@redhat.com> | 2013-06-20 16:20:07 +0100 |
|---|---|---|
| committer | Julie Pichon <jpichon@redhat.com> | 2013-06-22 06:28:26 +0100 |
| commit | a6fcfb4e73c67a0fc2b59a610779a6871d242146 (patch) | |
| tree | 027b720acb97d8049864cbfa9620988a68350e4e /openstack_dashboard | |
| parent | f356811ddd3edcd332abe9271bcf613c4fe36e82 (diff) | |
| download | tuskar-ui-a6fcfb4e73c67a0fc2b59a610779a6871d242146.tar.gz | |
Clean-up some of the workflows-related javascript
* Initialise the workflows javascript outside modals too
When opening the Modify Users page into a new window rather than as
a modal form, the "All Users" and "Project Members" lists would show
as empty as the javascript for initialising workflow wasn't
called. Also fix similar problems in other workflows such as Edit
Security Groups, Launch Instances' network list.
* Avoid having the projects-specific workflow js initialised on every
modal init
* Move the Network List drag & drop to horizon.instances.js as it's
unrelated to Project workflows
Also:
* Fix a typo in help text
Fixes bug #1193007
Change-Id: If476d6babf3d93bd6e9abb051008aff4fb393436
Diffstat (limited to 'openstack_dashboard')
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/templates/instances/_update_networks.html | 11 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/workflows/create_instance.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_update_networks.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_update_networks.html index a8185f48..1f635a8d 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_update_networks.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_update_networks.html @@ -33,3 +33,14 @@ </tr> </tbody> </table> + + +<script> + if (typeof $ !== 'undefined') { + horizon.instances.workflow_init($(".workflow")); + } else { + addHorizonLoadEvent(function() { + horizon.instances.workflow_init($(".workflow")); + }); + } +</script> diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py index 072ec418..fce4c8fd 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py @@ -441,7 +441,7 @@ class SetNetworkAction(workflows.Action): "At least one network must" " be specified.")}, help_text=_("Launch instance with" - "these networks")) + " these networks")) class Meta: name = _("Networking") |