git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tenant view only shows sites the user should be able to see
[plstackapi.git]
/
planetstack
/
core
/
xoslib
/
static
/
js
/
xosDeveloper_datatables.js
diff --git
a/planetstack/core/xoslib/static/js/xosDeveloper_datatables.js
b/planetstack/core/xoslib/static/js/xosDeveloper_datatables.js
index
f0f92bf
..
7d6ee3c
100644
(file)
--- a/
planetstack/core/xoslib/static/js/xosDeveloper_datatables.js
+++ b/
planetstack/core/xoslib/static/js/xosDeveloper_datatables.js
@@
-12,15
+12,20
@@
row = data.models[rowkey];
slicename = row.get("name");
sliceid = row.get("id");
row = data.models[rowkey];
slicename = row.get("name");
sliceid = row.get("id");
- role = row.get("sliceInfo").roles[0];
+ role = row.get("sliceInfo").roles[0]
|| ""
;
slivercount = row.get("sliceInfo").sliverCount;
sitecount = row.get("sliceInfo").siteCount;
slivercount = row.get("sliceInfo").sliverCount;
sitecount = row.get("sliceInfo").siteCount;
+ backendHtml = row.get("backendHtml")
- if (! role) {
+ //if (! role) {
+ // continue;
+ //}
+
+ if (! row.get("current_user_can_see") ) {
continue;
}
continue;
}
- actualEntries.push([
'
<a href="/admin/core/slice/' + sliceid + '">' + slicename + '</a>',
+ actualEntries.push([
backendHtml + '
<a href="/admin/core/slice/' + sliceid + '">' + slicename + '</a>',
role, slivercount, sitecount]);
}
oTable = $('#dynamicusersliceinfo').dataTable( {
role, slivercount, sitecount]);
}
oTable = $('#dynamicusersliceinfo').dataTable( {