From ae04d8d4ca484315fb1f1e0a9456d9992394d3b9 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Tue, 22 Apr 2014 21:02:45 -0700 Subject: [PATCH] merge latest Amisha changes --- planetstack/core/plus/sites.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/planetstack/core/plus/sites.py b/planetstack/core/plus/sites.py index efa1b83..20c2d6a 100644 --- a/planetstack/core/plus/sites.py +++ b/planetstack/core/plus/sites.py @@ -12,7 +12,7 @@ class AdminMixin(object): def get_urls(self): """Add our dashboard view to the admin urlconf. Deleted the default index.""" from django.conf.urls import patterns, url - from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView, TenantViewData,TenantCreateSlice, TenantAddOrRemoveSliverView, TenantPickSitesView + from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView, TenantViewData,TenantCreateSlice, TenantAddOrRemoveSliverView, TenantPickSitesView, TenantDeleteSliceView,TenantUpdateSlice urls = super(AdminMixin, self).get_urls() del urls[0] @@ -39,8 +39,12 @@ class AdminMixin(object): name="tenantview"), url(r'^createnewslice/$', self.admin_view(TenantCreateSlice.as_view()), name="createnewslice"), + url(r'^updateslice/$', self.admin_view(TenantUpdateSlice.as_view()), + name="updateslice"), url(r'^picksites/$', self.admin_view(TenantPickSitesView.as_view()), - name="picksites") + name="picksites"), + url(r'^tenantdeleteslice/$', self.admin_view(TenantDeleteSliceView.as_view()), + name="tenantdeleteslice") ) return custom_url + urls -- 2.47.0