X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fdashboardview.py;h=0de9b93f3270e8a438cf24858342e6a7e47d77d1;hb=refs%2Fheads%2Ff4f-review;hp=3910726c81afc693bffc387803dce15fab020a7f;hpb=a7337c66c2c7c3312c4205a8119252f04a1fbd58;p=myslice.git diff --git a/portal/dashboardview.py b/portal/dashboardview.py index 3910726c..0de9b93f 100644 --- a/portal/dashboardview.py +++ b/portal/dashboardview.py @@ -1,6 +1,6 @@ import json from manifold.core.query import Query -from manifold.manifoldapi import execute_query +from manifoldapi.manifoldapi import execute_query from unfold.page import Page @@ -11,7 +11,7 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView from ui.topmenu import topmenu_items_live, the_user -from theme import ThemeView +from myslice.theme import ThemeView #This view requires login class DashboardView (LoginRequiredAutoLogoutView, ThemeView): @@ -22,7 +22,6 @@ class DashboardView (LoginRequiredAutoLogoutView, ThemeView): # We might have slices on different registries with different user accounts # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn - #messages.info(self.request, 'You have logged in') page = Page(self.request) @@ -48,7 +47,9 @@ class DashboardView (LoginRequiredAutoLogoutView, ThemeView): # root_authority = sub_authority[0] # slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') # else: - slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('slice.slice_hrn') + print "SLICE QUERY" + print "-" * 80 + slice_query = Query().get('myslice:user').filter_by('user_hrn', '==', '$user_hrn').select('slices.slice_hrn') page.enqueue_query(slice_query) page.enqueue_query(testbed_query)