merge Amisha's changes
diff --git a/planetstack/core/plus/sites.py b/planetstack/core/plus/sites.py
index 6fd278b..c5dde52 100644
--- a/planetstack/core/plus/sites.py
+++ b/planetstack/core/plus/sites.py
@@ -12,13 +12,15 @@
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
+ from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView, TenantViewData,TenantCreateSlice
urls = super(AdminMixin, self).get_urls()
del urls[0]
custom_url = patterns('',
url(r'^$', self.admin_view(DashboardWelcomeView.as_view()),
name="index"),
+ url(r'^test/', self.admin_view(DashboardUserSiteView.as_view()),
+ name="test"),
url(r'^hpcdashuserslices/', self.admin_view(DashboardUserSiteView.as_view()),
name="hpcdashuserslices"),
url(r'^hpcdashboard/', self.admin_view(DashboardAjaxView.as_view()), # DEPRECATED
@@ -30,7 +32,11 @@
url(r'^analytics/(?P<name>\w+)/$', DashboardAnalyticsAjaxView.as_view(),
name="analytics"),
url(r'^dashboardaddorremsliver/$', self.admin_view(DashboardAddOrRemoveSliverView.as_view()),
- name="addorremsliver")
+ name="addorremsliver"),
+ url(r'^tenantview/$', self.admin_view(TenantViewData.as_view()),
+ name="tenantview"),
+ url(r'^createnewslice/$', self.admin_view(TenantCreateSlice.as_view()),
+ name="createnewslice")
)
return custom_url + urls