projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Admin: project and user management hide/show based on role
[osm/UI.git]
/
skyquake
/
framework
/
widgets
/
skyquake_nav
/
skyquakeNav.jsx
diff --git
a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
index
c4df1e2
..
f9161cc
100644
(file)
--- a/
skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
+++ b/
skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
@@
-309,6
+309,7
@@
export function buildNav(nav, currentPlugin, props) {
label: nav[k].label || k,
route: route
});
label: nav[k].label || k,
route: route
});
+ let shouldAllow = nav[k].allow || ['*'];
if (nav[k].pluginName == currentPlugin) {
navClass += " active";
}
if (nav[k].pluginName == currentPlugin) {
navClass += " active";
}
@@
-316,13
+317,15
@@
export function buildNav(nav, currentPlugin, props) {
navItem.priority = nav[k].priority;
navItem.order = nav[k].order;
if(nav[k].admin_link) {
navItem.priority = nav[k].priority;
navItem.order = nav[k].order;
if(nav[k].admin_link) {
- adminNav.push((
- <li key={nav[k].name}>
- {dashboardLink}
- </li>
- ))
+
+ if (isRBACValid(User, shouldAllow) ){
+ adminNav.push((
+ <li key={nav[k].name}>
+ {dashboardLink}
+ </li>
+ ))
+ }
} else {
} else {
- let shouldAllow = nav[k].allow || ['*'];
if (isRBACValid(User, shouldAllow) ){
navItem.html = (
<div key={k} className={navClass}>
if (isRBACValid(User, shouldAllow) ){
navItem.html = (
<div key={k} className={navClass}>