Skip to content

Commit

Permalink
fix: angular code improvements, issues hit by build process
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasbaldi committed Oct 29, 2019
1 parent ad0ebfb commit 4fc9923
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ErrorHandlerService } from 'src/app/services/error-handler.service';
})
export class CategoryListComponent implements OnInit {
public categoryList: Array<Category> = [];
public search: string = '';

constructor(
private router: Router,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class ProductListComponent implements OnInit {
@Input() productList: Array<Product> = [];
public categoryList: Array<Category> = [];
@Input() categoryView: Boolean = false;
public search: string = '';

constructor(
private stjornaService: StjornaService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class ServiceListComponent implements OnInit {
@Input() serviceList: Array<Service> = [];
public categoryList: Array<Category> = [];
@Input() categoryView: Boolean = false;
public search: string = '';

constructor(
private stjornaService: StjornaService,
Expand Down
8 changes: 4 additions & 4 deletions client/src/app/models/config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export class Config {
private password_secret: string;
private allow_remote_access: boolean;
private image: ConfigImage;
private installed: boolean;
password_secret: string;
allow_remote_access: boolean;
image: ConfigImage;
installed: boolean;

constructor(
password_secret?: string,
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/profile/profile.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h5 class="card-title">{{'profile.basic.title' | translate}}</h5>
<small class="form-text text-muted"
for="active">{{'profile.basic.password.newRepeat' | translate}}</small><br>
<div *ngIf="((pwNew.invalid || pwNew.pristine) && pwNew.dirty) ||
((pwNewRepeat.invalid || pwNewRepeat.pristine) && pwNewRepeat.dirty) || passwordNew !== passwordNewRepeat"
((pwNewRepeat.invalid || pwNewRepeat.pristine) && pwNewRepeat.dirty) || currentUser.passwordNew !== currentUser.passwordNewRepeat"
class="alert alert-danger">
<small>Every field is required. Please enter correct values. The new passwords has to be the
same one.<br>
Expand Down

0 comments on commit 4fc9923

Please sign in to comment.