Merge "Fix create environment TypeError"

This commit is contained in:
Jenkins 2017-07-14 14:42:21 +00:00 committed by Gerrit Code Review
commit ec4cfecb4b
2 changed files with 3 additions and 2 deletions

View File

@ -174,9 +174,10 @@ class CreateEnvironmentView(views.ModalFormView):
submit_url = reverse_lazy(
'horizon:app-catalog:environments:create_environment')
def get_form(self, form_class):
def get_form(self, **kwargs):
if 'next' in self.request.GET:
self.request.session['next_url'] = self.request.GET['next']
form_class = kwargs.get('form_class', self.get_form_class())
return super(CreateEnvironmentView, self).get_form(form_class)
def get_success_url(self):

View File

@ -271,7 +271,7 @@ class TestCreateEnvironmentView(testtools.TestCase):
@mock.patch('muranodashboard.environments.forms.net')
def test_get_form(self, mock_net):
mock_net.get_available_networks.return_value = None
form = self.create_env_view.get_form(self.create_env_view.form_class)
form = self.create_env_view.get_form()
self.assertIsInstance(form, env_forms.CreateEnvironmentForm)
self.assertEqual('next_foo_url',