summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Nurlygayanov <tnurlygayanov@mirantis.com>2013-04-08 13:03:18 +0400
committerGerrit Code Review <gitolite@gitolite.vm.mirantis.net>2013-04-08 13:03:18 +0400
commita3e6fdd2958c2886392bf40660998d18482203ca (patch)
tree63c8d6654cb706fbf69a5b8a0fded566460310de
parentc0b95197f03c7b06d4959aeb355efc86dbe5b2ea (diff)
parentb9d7d91bd0e2d4f4af8ecb7c4e0317c2de133301 (diff)
Merge "Fixed issue with names."
-rw-r--r--dashboard/glazierdashboard/tabula/urls.py4
-rw-r--r--dashboard/glazierdashboard/tabula/views.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/dashboard/glazierdashboard/tabula/urls.py b/dashboard/glazierdashboard/tabula/urls.py
index 9969b39..7e273fb 100644
--- a/dashboard/glazierdashboard/tabula/urls.py
+++ b/dashboard/glazierdashboard/tabula/urls.py
@@ -15,7 +15,7 @@
15 15
16from django.conf.urls.defaults import patterns, url 16from django.conf.urls.defaults import patterns, url
17 17
18from .views import IndexView, Services, CreateDCView, DetailServiceView 18from .views import IndexView, Services, CreateEnvironmentView, DetailServiceView
19from .views import Wizard 19from .views import Wizard
20from .forms import WizardFormServiceType, WizardFormConfiguration 20from .forms import WizardFormServiceType, WizardFormConfiguration
21 21
@@ -27,7 +27,7 @@ urlpatterns = patterns(VIEW_MOD,
27 Wizard.as_view([WizardFormServiceType, 27 Wizard.as_view([WizardFormServiceType,
28 WizardFormConfiguration]), 28 WizardFormConfiguration]),
29 name='create'), 29 name='create'),
30 url(r'^create_dc$', CreateDCView.as_view(), 30 url(r'^create_dc$', CreateEnvironmentView.as_view(),
31 name='create_dc'), 31 name='create_dc'),
32 url(r'^(?P<environment_id>[^/]+)/$', 32 url(r'^(?P<environment_id>[^/]+)/$',
33 Services.as_view(), name='services'), 33 Services.as_view(), name='services'),
diff --git a/dashboard/glazierdashboard/tabula/views.py b/dashboard/glazierdashboard/tabula/views.py
index d83b77a..5f46c76 100644
--- a/dashboard/glazierdashboard/tabula/views.py
+++ b/dashboard/glazierdashboard/tabula/views.py
@@ -193,12 +193,12 @@ class DetailServiceView(tabs.TabView):
193 return self.tab_group_class(request, service=service, **kwargs) 193 return self.tab_group_class(request, service=service, **kwargs)
194 194
195 195
196class CreateDCView(workflows.WorkflowView): 196class CreateEnvironmentView(workflows.WorkflowView):
197 workflow_class = CreateDC 197 workflow_class = CreateEnvironment
198 template_name = 'create_dc.html' 198 template_name = 'create_dc.html'
199 199
200 def get_initial(self): 200 def get_initial(self):
201 initial = super(CreateDCView, self).get_initial() 201 initial = super(CreateEnvironmentView, self).get_initial()
202 initial['project_id'] = self.request.user.tenant_id 202 initial['project_id'] = self.request.user.tenant_id
203 initial['user_id'] = self.request.user.id 203 initial['user_id'] = self.request.user.id
204 return initial 204 return initial