Merge pull request #220 from junkerm/develop

v0.1.11
junkerm · Jul 13, 2018 · 124a46c · 124a46c
2 parents cd334ef + ab516d6
commit 124a46c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/web/src/app/modules/views/main/authentication/modules/login/components/login.component.html b/web/src/app/modules/views/main/authentication/modules/login/components/login.component.html
@@ -41,7 +41,7 @@ <h1 class="card-title text-center mb-4 mt-1">{{'login' | translate}}</h1>
                 </div>
                 <div ngbDropdown class="d-inline-block" #projectDropdown>
                     <button class="btn btn-sm btn-outline-primary" id="projectDropdown" ngbDropdownToggle>
-                        {{project || 'project' | translate}}
+                        {{project ? project : ('project' | translate)}}
                     </button>
                     <div ngbDropdownMenu aria-labelledby="projectDropdown">
                         <button *ngFor="let name of projectnames" class="dropdown-item" (click)="project = name">{{name}}</button>

diff --git a/web/src/app/modules/views/main/authentication/modules/login/components/login.component.ts b/web/src/app/modules/views/main/authentication/modules/login/components/login.component.ts
@@ -12,7 +12,7 @@ import { NavigatorService } from '../../../../../../navigation/modules/navigator
 export class Login implements OnInit {
     public username = 'The username';
     public password = 'The secret password';
-    public project = '';
+    public _project = '';
     public projectnames: string[];
 
     public isAuthenticating = false;
@@ -21,6 +21,15 @@ export class Login implements OnInit {
       auth.getProjectNames().then(res => this.projectnames = res);
     }
 
+    public get project(): string {
+        return this._project;
+    }
+
+    public set project(project: string) {
+        this._project = project;
+    }
+
+
     ngOnInit() {
         this.tryNavigateAway();
     }