git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed ple-dependent request (test?)
[unfold.git]
/
portal
/
dashboardview.py
diff --git
a/portal/dashboardview.py
b/portal/dashboardview.py
index
1a05359
..
1cc12e0
100644
(file)
--- a/
portal/dashboardview.py
+++ b/
portal/dashboardview.py
@@
-3,9
+3,9
@@
from unfold.page import Page
from plugins.lists.simplelist import SimpleList
from plugins.lists.simplelist import SimpleList
-from
views.loginrequired
import LoginRequiredAutoLogoutView
+from
unfold.loginrequired
import LoginRequiredAutoLogoutView
-from
myslice.viewutils
import topmenu_items, the_user
+from
ui.topmenu
import topmenu_items, the_user
#This view requires login
class DashboardView (LoginRequiredAutoLogoutView):
#This view requires login
class DashboardView (LoginRequiredAutoLogoutView):
@@
-22,10
+22,9
@@
class DashboardView (LoginRequiredAutoLogoutView):
# Slow...
#slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
# Slow...
#slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
+ auth_query = Query().get('network').select('network_hrn','platform')
+ # DEMO GEC18 Query only PLE
slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
- auth_query = Query().get('network').select('network_hrn')
- print "AUTH QUERY =====================", auth_query
- print "filter", auth_query.filters
page.enqueue_query(slice_query)
page.enqueue_query(auth_query)
page.enqueue_query(slice_query)
page.enqueue_query(auth_query)
@@
-38,14
+37,14
@@
class DashboardView (LoginRequiredAutoLogoutView):
key = 'slice.slice_hrn',
query = slice_query,
)
key = 'slice.slice_hrn',
query = slice_query,
)
-
+ # XXX TODO: plugins/lists/static/js/simplelist.js => hardcoded keys that give links : slice_hrn & platform
authlist = SimpleList(
title = None,
page = page,
authlist = SimpleList(
title = None,
page = page,
- key = '
network_hrn
',
+ key = '
platform
',
query = auth_query,
)
query = auth_query,
)
-
+
context = super(DashboardView, self).get_context_data(**kwargs)
context['person'] = self.request.user
context['networks'] = authlist.render(self.request)
context = super(DashboardView, self).get_context_data(**kwargs)
context['person'] = self.request.user
context['networks'] = authlist.render(self.request)
@@
-53,7
+52,7
@@
class DashboardView (LoginRequiredAutoLogoutView):
# XXX This is repeated in all pages
# more general variables expected in the template
# XXX This is repeated in all pages
# more general variables expected in the template
- context['title'] = '
Test view that combines various plugins
'
+ context['title'] = '
Dashboard
'
# the menu items on the top
context['topmenu_items'] = topmenu_items('Dashboard', self.request)
# so we can sho who is logged
# the menu items on the top
context['topmenu_items'] = topmenu_items('Dashboard', self.request)
# so we can sho who is logged