diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-30 11:06:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-30 11:06:45 +0000 |
| commit | 584d2b9ef8db831b13ef958fa5afd8862ab11560 (patch) | |
| tree | 3009c610ab66fb1910ce6f0f7300b83c4d28577f | |
| parent | d7e3be8973ef299bcc07ff2beae985519c64d1d2 (diff) | |
| parent | b5f582f2cff90a0bdc27d5a4e111a2fae2d7f157 (diff) | |
| download | tuskar-ui-584d2b9ef8db831b13ef958fa5afd8862ab11560.tar.gz | |
Merge "Use current user's e-mail address as default in post-init"
| -rw-r--r-- | tuskar_ui/infrastructure/overview/forms.py | 5 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/overview/tests.py | 1 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/overview/views.py | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tuskar_ui/infrastructure/overview/forms.py b/tuskar_ui/infrastructure/overview/forms.py index 965814ad..72449db6 100644 --- a/tuskar_ui/infrastructure/overview/forms.py +++ b/tuskar_ui/infrastructure/overview/forms.py @@ -341,10 +341,7 @@ class UndeployOvercloud(horizon.forms.SelfHandlingForm): class PostDeployInit(horizon.forms.SelfHandlingForm): - # TODO(lsmola) put here signed user email, has to be done dynamically - # in init - admin_email = horizon.forms.CharField( - label=_("Admin Email"), initial="example@example.org") + admin_email = horizon.forms.CharField(label=_("Admin Email")) public_host = horizon.forms.CharField( label=_("Public Host"), initial="", required=False) region = horizon.forms.CharField( diff --git a/tuskar_ui/infrastructure/overview/tests.py b/tuskar_ui/infrastructure/overview/tests.py index a0683b6c..85cad236 100644 --- a/tuskar_ui/infrastructure/overview/tests.py +++ b/tuskar_ui/infrastructure/overview/tests.py @@ -230,6 +230,7 @@ class OverviewTests(test.BaseAdminViewTests): return_value=stack), ): res = self.client.get(POST_DEPLOY_INIT_URL) + self.assertEqual(res.context['form']['admin_email'].value(), '') self.assertTemplateUsed( res, 'infrastructure/overview/post_deploy_init.html') diff --git a/tuskar_ui/infrastructure/overview/views.py b/tuskar_ui/infrastructure/overview/views.py index 6e0c17f5..61dbc2b8 100644 --- a/tuskar_ui/infrastructure/overview/views.py +++ b/tuskar_ui/infrastructure/overview/views.py @@ -318,6 +318,7 @@ class PostDeployInitView(horizon.forms.ModalFormView, views.StackMixin): def get_initial(self, **kwargs): initial = super(PostDeployInitView, self).get_initial(**kwargs) initial['stack_id'] = self.get_stack().id + initial['admin_email'] = getattr(self.request.user, 'email', '') return initial |