fix getting roles

This commit is contained in:
GotPPay
2018-05-25 17:15:31 +02:00
parent 11fe5f1c61
commit ef904e4e38
2 changed files with 35 additions and 31 deletions

View File

@@ -101,10 +101,10 @@ class SidebarContent extends React.Component {
return ( return (
<ul className="nav" ref={(c) => { this.nav = c; }}> <ul className="nav" ref={(c) => { this.nav = c; }}>
{loggedUser.anyOf(planScheduler, visitReporter) && {loggedUser.anyOf(visitReporter) &&
<li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li> <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
} }
{!loggedUser.anyOf(planScheduler, visitReporter) && {!loggedUser.anyOf(visitReporter) &&
<li> <li>
<FlatButton href="#/app/form"><i className="nav-icon material-icons cyan-text text-lighter-4">directions_car</i><span className="nav-text">Rides</span></FlatButton> <FlatButton href="#/app/form"><i className="nav-icon material-icons cyan-text text-lighter-4">directions_car</i><span className="nav-text">Rides</span></FlatButton>
<ul> <ul>
@@ -113,7 +113,7 @@ class SidebarContent extends React.Component {
</ul> </ul>
</li> </li>
} }
{!loggedUser.anyOf(planScheduler, visitReporter) && {!loggedUser.anyOf(visitReporter) &&
<li> <li>
<FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton> <FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton>
<ul> <ul>
@@ -122,6 +122,7 @@ class SidebarContent extends React.Component {
</ul> </ul>
</li> </li>
} }
{!loggedUser.anyOf(visitReporter) &&
<li> <li>
<FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton> <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
<ul> <ul>
@@ -129,7 +130,9 @@ class SidebarContent extends React.Component {
<li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li> <li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li>
</ul> </ul>
</li> </li>
}
{!loggedUser.anyOf(visitReporter) &&
<li> <li>
<FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton> <FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton>
<ul> <ul>
@@ -152,6 +155,7 @@ class SidebarContent extends React.Component {
</li> */} </li> */}
</ul> </ul>
</li> </li>
}
<li className="nav-divider" /> <li className="nav-divider" />
</ul> </ul>

View File

@@ -11,7 +11,7 @@ const normalizeRoles = (profiles) => {
} }
if (roleKeys.length === 1) { if (roleKeys.length === 1) {
return profiles[roleKeys[0]].authorize; return profiles[roleKeys[0]].roles;
} }
const roles = profiles.reduce((result, profile) => { const roles = profiles.reduce((result, profile) => {