seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dashboard: fix logout 

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
6.19.x
Oleksii Kurinnyi 2017-10-04 16:18:53 +03:00
parent 0d8d93377f
commit 9af003ddfb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/src/app/navbar/navbar.controller.ts
View File

@ -55,6 +55,7 @@ export class CheNavBarController {
private organizations: Array<che.IOrganization>;
private cheKeycloak: CheKeycloak;
private cheService: CheService;
private isPermissionServiceAvailable: boolean;
/**
* Default constructor
@ -92,7 +93,10 @@ export class CheNavBarController {
cheAPI.getWorkspace().fetchWorkspaces();
cheAPI.getFactory().fetchFactories();
this.isPermissionServiceAvailable = false;
this.resolvePermissionServiceAvailability().then((isAvailable: boolean) => {
this.isPermissionServiceAvailable = isAvailable;
if (isAvailable) {
if (this.chePermissions.getSystemPermissions()) {
this.updateData();

4
dashboard/src/app/navbar/navbar.html
View File

@ -75,7 +75,7 @@
</div>
</md-button>
</md-list-item>
<md-list-item flex class="navbar-subsection-item" ng-if="navbarController.isPermissionServiceAvailable() && !navbarController.userServices.hasInstallationManagerService && !navbarController.hasPersonalAccount">
<md-list-item flex class="navbar-subsection-item" ng-if="navbarController.isPermissionServiceAvailable && !navbarController.userServices.hasInstallationManagerService && !navbarController.hasPersonalAccount">
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.organizations}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
@ -131,7 +131,7 @@
<div class="admin-navbar-menu"
layout="column" layout-align="end stretch" flex>
<section class="left-sidebar-menu navbar-account-section"
ng-if="navbarController.isPermissionServiceAvailable()">
ng-if="navbarController.isPermissionServiceAvailable">
<md-list layout="column" flex>
<md-list-item class="navbar-subsection-item">