git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using URNs instead of HRNs = this works for the checkboxes in querytable & googlemap...
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
0c32b40
..
4d23bbb
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-62,7
+62,7
@@
class SliceView (LoginRequiredAutoLogoutView):
main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
main_query.select(
'slice_hrn',
main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
main_query.select(
'slice_hrn',
- 'resource.hrn', 'resource.hostname', 'resource.type',
+ 'resource.hrn', 'resource.
urn', 'resource.
hostname', 'resource.type',
'resource.network_hrn',
'lease.urn',
'user.user_hrn',
'resource.network_hrn',
'lease.urn',
'user.user_hrn',
@@
-70,7
+70,7
@@
class SliceView (LoginRequiredAutoLogoutView):
)
# for internal use in the querytable plugin;
# needs to be a unique column present for each returned record
)
# for internal use in the querytable plugin;
# needs to be a unique column present for each returned record
- main_query_key = 'hrn'
+
#
main_query_key = 'hrn'
query_resource_all = Query.get('resource').select(resource_fields)
if do_query_users:
query_resource_all = Query.get('resource').select(resource_fields)
if do_query_users:
@@
-188,7
+188,7
@@
class SliceView (LoginRequiredAutoLogoutView):
query = sq_resource,
query_all = query_resource_all,
# safer to use 'hrn' as the internal unique key for this plugin
query = sq_resource,
query_all = query_resource_all,
# safer to use 'hrn' as the internal unique key for this plugin
- id_key = main_query_key,
+
#
id_key = main_query_key,
checkboxes = True,
datatables_options = {
'iDisplayLength': 25,
checkboxes = True,
datatables_options = {
'iDisplayLength': 25,