static/src/app/app.component.html

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

static/src/app/services/login-service/login-service.ts

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