github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #3735

Browse source
This commit is contained in:
tidusjar 2020-09-17 08:53:28 +01:00
commit 4351dd5f09
6 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi/ClientApp/src/app/auth/auth.service.ts
View file

@ -67,8 +67,8 @@ export class AuthService extends ServiceHelpers {
public hasRole(role: string): boolean {
const claims = this.claims();
if (claims && claims.roles && role) {
return claims.roles.some(r => r.toUpperCase() === role.toUpperCase());
if (claims && claims.roles && role && claims.roles.length > 0) {
return claims.roles.some(r => r != undefined && r.toUpperCase() === role.toUpperCase());
}
return false;
}

6
src/Ombi/ClientApp/src/app/login/login.component.html
View file

@ -12,14 +12,14 @@
<mat-form-field class="dark full-width" appearance="outline">
<mat-label>{{'Login.UsernamePlaceholder' | translate}}</mat-label>
<input type="text" matInput formControlName="username" />
<mat-error *ngIf="form.get('username').hasError('required')">
<input id="username-field" type="text" matInput formControlName="username" />
<mat-error id="username-error" *ngIf="form.get('username').hasError('required')">
{{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
</mat-form-field>
<mat-form-field class="full-width" appearance="outline">
<mat-label>{{'Login.PasswordPlaceholder' | translate}}</mat-label>
<input color="black" type="password" matInput formControlName="password" />
<input id="password-field" color="black" type="password" matInput formControlName="password" />
</mat-form-field>
<mat-checkbox formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>

2
src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
View file

@ -21,7 +21,7 @@
</div>
</span>
<a class="bottom-nav-link" mat-list-item [routerLinkActive]="getTheme()" aria-label="Toggle sidenav" (click)="logOut();">
<a id="nav-logout" class="bottom-nav-link" mat-list-item [routerLinkActive]="getTheme()" aria-label="Toggle sidenav" (click)="logOut();">
<mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon>
{{ 'NavigationBar.Logout' | translate }}
</a>

3
src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
View file

@ -2,12 +2,11 @@
aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [inputFormatter]="formatter" [resultTemplate]="template" (selectItem)="selected($event)">
<ng-template #template let-result="result">
</ng-template> -->
<form [formGroup]='searchForm'>
<mat-form-field floatLabel="never" style="width: 100%;">
<input matInput placeholder="{{'NavigationBar.Search' | translate}}" [matAutocomplete]="auto" formControlName='input'>
<input id="nav-search" matInput placeholder="{{'NavigationBar.Search' | translate}}" [matAutocomplete]="auto" formControlName='input'>
</mat-form-field>
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)" [displayWith]="displayFn">

6
src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
View file

@ -61,7 +61,7 @@
</mat-select>
</mat-form-field>
<div class="md-form-field" style="display:inline;margin-left:20px;">
<button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span
<button mat-raised-button type="button" (click)="getProfiles(form)" color="primary">Load Profiles <span
*ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
</div>
</div>
@ -76,7 +76,7 @@
</mat-select>
</mat-form-field>
<div class="md-form-field" style="display:inline;margin-left:20px;">
<button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span
<button mat-raised-button type="button" (click)="getRootFolders(form)" color="primary">Load Root Folders <span
*ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
</div>
</div>
@ -91,7 +91,7 @@
</mat-select>
</mat-form-field>
<div class="md-form-field" style="display:inline;margin-left:20px;">
<button mat-raised-button (click)="getMetadataProfiles(form)" color="primary">Load Metadata <span
<button mat-raised-button type="button" (click)="getMetadataProfiles(form)" color="primary">Load Metadata <span
*ngIf="metadataRunning" class="fa fa-spinner fa-spin"></span></button></div>
</div>

20
src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts
View file

@ -35,7 +35,7 @@ export class LidarrComponent implements OnInit {
this.form = this.fb.group({
enabled: [x.enabled],
apiKey: [x.apiKey, [Validators.required]],
defaultQualityProfile: [x.defaultQualityProfile, [Validators.required]],
defaultQualityProfile: [+x.defaultQualityProfile, [Validators.required]],
defaultRootPath: [x.defaultRootPath, [Validators.required]],
ssl: [x.ssl],
subDir: [x.subDir],
@ -45,6 +45,15 @@ export class LidarrComponent implements OnInit {
metadataProfileId: [x.metadataProfileId, [Validators.required]],
addOnly: [x.addOnly],
});
this.qualities = [];
this.qualities.push({ name: "Please Select", id: -1 });
this.rootFolders = [];
this.rootFolders.push({ path: "Please Select", id: -1 });
this.metadataProfiles = [];
this.metadataProfiles.push({ name: "Please Select", id: -1 });
if (x.defaultQualityProfile) {
this.getProfiles(this.form);
@ -56,15 +65,6 @@ export class LidarrComponent implements OnInit {
this.getMetadataProfiles(this.form);
}
});
this.qualities = [];
this.qualities.push({ name: "Please Select", id: -1 });
this.rootFolders = [];
this.rootFolders.push({ path: "Please Select", id: -1 });
this.metadataProfiles = [];
this.metadataProfiles.push({ name: "Please Select", id: -1 });
}
public getProfiles(form: FormGroup) {