openstack
/
python-muranoclient
Code Issues Proposed changes

Merge "Fixed issue with names."

This commit is contained in:
Timur Nurlygayanov 2013-04-08 13:03:18 +04:00 committed by Gerrit Code Review
parent c0b95197f0 b9d7d91bd0
commit a3e6fdd295
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/glazierdashboard/tabula/urls.py
View File

@ -15,7 +15,7 @@
from django.conf.urls.defaults import patterns, url from django.conf.urls.defaults import patterns, url
from .views import IndexView, Services, CreateDCView, DetailServiceView from .views import IndexView, Services, CreateEnvironmentView, DetailServiceView
from .views import Wizard from .views import Wizard
from .forms import WizardFormServiceType, WizardFormConfiguration from .forms import WizardFormServiceType, WizardFormConfiguration
@ -27,7 +27,7 @@ urlpatterns = patterns(VIEW_MOD,
Wizard.as_view([WizardFormServiceType, Wizard.as_view([WizardFormServiceType,
WizardFormConfiguration]), WizardFormConfiguration]),
name='create'), name='create'),
url(r'^create_dc$', CreateDCView.as_view(), url(r'^create_dc$', CreateEnvironmentView.as_view(),
name='create_dc'), name='create_dc'),
url(r'^(?P<environment_id>[^/]+)/$', url(r'^(?P<environment_id>[^/]+)/$',
Services.as_view(), name='services'), Services.as_view(), name='services'),

6
dashboard/glazierdashboard/tabula/views.py
View File

@ -193,12 +193,12 @@ class DetailServiceView(tabs.TabView):
return self.tab_group_class(request, service=service, **kwargs) return self.tab_group_class(request, service=service, **kwargs)
class CreateDCView(workflows.WorkflowView): class CreateEnvironmentView(workflows.WorkflowView):
workflow_class = CreateDC workflow_class = CreateEnvironment
template_name = 'create_dc.html' template_name = 'create_dc.html'
def get_initial(self): def get_initial(self):
initial = super(CreateDCView, self).get_initial() initial = super(CreateEnvironmentView, self).get_initial()
initial['project_id'] = self.request.user.tenant_id initial['project_id'] = self.request.user.tenant_id
initial['user_id'] = self.request.user.id initial['user_id'] = self.request.user.id
return initial return initial