Compare commits

..

2 Commits

Author SHA1 Message Date
Florian Hartwich 9ab53c96e8 add user check to class check 2017-09-18 19:42:15 +02:00
Florian Hartwich 6c7088bc01 simplyfy currentUser checkup 2017-09-18 19:38:05 +02:00
2 changed files with 4 additions and 8 deletions

View File

@ -54,7 +54,7 @@
</li> </li>
<li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown"> <li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
<a href="#" <a href="#"
[ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}" [ngClass]="{'unprocessed': loginService.hasPermission(2) && loginService.hasSquad() && (promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards)}"
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
Anträge Anträge
@ -62,11 +62,11 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}" <a [ngClass]="{'unprocessed-child': loginService.hasPermission(2) && loginService.hasSquad() && promotionService.hasUnprocessedPromotion}"
routerLink="{{config.request}}/{{config.confirmPromotionPath}}">Beförderung</a> routerLink="{{config.request}}/{{config.confirmPromotionPath}}">Beförderung</a>
</li> </li>
<li> <li>
<a [ngClass]="{'unprocessed-child': awardingService.hasUnprocessedAwards}" <a [ngClass]="{'unprocessed-child': loginService.hasPermission(2) && loginService.hasSquad() && awardingService.hasUnprocessedAwards}"
routerLink="{{config.request}}/{{config.confirmAwardPath}}">Orden/ Auszeichnung</a> routerLink="{{config.request}}/{{config.confirmAwardPath}}">Orden/ Auszeichnung</a>
</li> </li>
</ul> </ul>

View File

@ -35,7 +35,6 @@ export class LoginService {
signUp(username: string, password: string, secret: string) { signUp(username: string, password: string, secret: string) {
return this.http.post(this.config.apiSignupPath, {username: username, password: password, secret: secret}) return this.http.post(this.config.apiSignupPath, {username: username, password: password, secret: secret})
.map((response: Response) => { .map((response: Response) => {
}); });
} }
@ -45,10 +44,7 @@ export class LoginService {
} }
isLoggedIn() { isLoggedIn() {
if (localStorage.getItem('currentUser')) { return !!localStorage.getItem('currentUser');
return true;
}
return false
} }
hasPermission(level: number) { hasPermission(level: number) {