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
REG: user_hrn unique [using random numbers at the end]
[unfold.git]
/
portal
/
platformview.py
diff --git
a/portal/platformview.py
b/portal/platformview.py
index
a432bc1
..
86d282b
100644
(file)
--- a/
portal/platformview.py
+++ b/
portal/platformview.py
@@
-1,19
+1,18
@@
-from django.views.generic.base import TemplateView
-
from manifold.core.query import Query
from unfold.page import Page
from manifold.core.query import Query
from unfold.page import Page
-from myslice.viewutils import topmenu_items, the_user
+from unfold.loginrequired import FreeAccessView
+from ui.topmenu import topmenu_items_live, the_user
-from plugins.
hazelnut import Hazelnut
+from plugins.
querytable import QueryTable
# View for 1 platform and its details
# View for 1 platform and its details
-class PlatformView(
Template
View):
+class PlatformView(
FreeAccess
View):
template_name = "platform.html"
def get_context_data(self, **kwargs):
page = Page(self.request)
template_name = "platform.html"
def get_context_data(self, **kwargs):
page = Page(self.request)
-
+ page.add_js_files ( [ "js/common.functions.js" ] )
for key, value in kwargs.iteritems():
print "%s = %s" % (key, value)
if key == "platformname":
for key, value in kwargs.iteritems():
print "%s = %s" % (key, value)
if key == "platformname":
@@
-25,8
+24,7
@@
class PlatformView(TemplateView):
page.enqueue_query(network_query)
page.expose_js_metadata()
page.enqueue_query(network_query)
page.expose_js_metadata()
- page.expose_queries()
- networklist = Hazelnut(
+ networklist = QueryTable(
page = page,
title = 'List',
domid = 'checkboxes',
page = page,
title = 'List',
domid = 'checkboxes',
@@
-35,9
+33,6
@@
class PlatformView(TemplateView):
query_all = network_query,
checkboxes = False,
datatables_options = {
query_all = network_query,
checkboxes = False,
datatables_options = {
- # for now we turn off sorting on the checkboxes columns this way
- # this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength' : 25,
'bLengthChange' : True,
},
'iDisplayLength' : 25,
'bLengthChange' : True,
},
@@
-58,13
+53,10
@@
class PlatformView(TemplateView):
# more general variables expected in the template
context['title'] = 'Platforms connected to MySlice'
# the menu items on the top
# more general variables expected in the template
context['title'] = 'Platforms connected to MySlice'
# the menu items on the top
- context['topmenu_items'] = topmenu_items
('Platforms', self.request
)
+ context['topmenu_items'] = topmenu_items
_live('Platforms', page
)
# so we can sho who is logged
context['username'] = the_user(self.request)
context.update(page.prelude_env())
return context
# so we can sho who is logged
context['username'] = the_user(self.request)
context.update(page.prelude_env())
return context
-
-
-