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

fix(4616): 🐛 fixed mandatory fields

Browse source
This commit is contained in:
tidusjar 2022-04-24 22:10:44 +01:00
commit d8f2260c7a
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html
View file

@ -84,7 +84,7 @@
<th mat-header-cell *matHeaderCellDef> </th>
<td mat-cell *matCellDef="let element">
<a id="detailsButton{{element.id}}" mat-raised-button color="accent" [routerLink]="'/details/movie/' + element.theMovieDbId">{{ 'Requests.Details' | translate}}</a>
<button id="optionsButton{{element.id}}" mat-raised-button color="warn" (click)="openOptions(element)" *ngIf="isAdmin || ( manageOwnRequests && element.requestedUser?.userName == userName ) "> {{ 'Requests.Options' | translate}}</button>
<a id="optionsButton{{element.id}}" mat-raised-button color="warn" (click)="openOptions(element)" *ngIf="isAdmin || ( manageOwnRequests && element.requestedUser?.userName == userName ) "> {{ 'Requests.Options' | translate}}</a>
</td>
</ng-container>
@ -103,4 +103,4 @@
<button id="denyFabButton" mat-menu-item (click)="bulkDeny()">{{'Requests.RequestPanel.Deny' | translate}}</button>
<button *ngIf="is4kEnabled" id="deny4kFabButton" mat-menu-item (click)="bulkDeny4K()">{{'Requests.RequestPanel.Deny4K' | translate}}</button>
<button id="deleteFabButton" mat-menu-item (click)="bulkDelete()">{{'Requests.RequestPanel.Delete' | translate}}</button>
</mat-menu>
</mat-menu>

6
src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts
View file

@ -9,7 +9,7 @@ import { TesterService, NotificationService, RadarrService } from "../../../serv
selector: "ombi-settings-radarr-form",
templateUrl: "./radarr-form.component.html",
styleUrls: ["./radarr-form.component.scss"],
// changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush
})
export class RadarrFormComponent implements OnInit {
@ -23,11 +23,11 @@ export class RadarrFormComponent implements OnInit {
constructor(private radarrService: RadarrService,
private notificationService: NotificationService,
private testerService: TesterService,
private controlContainer: ControlContainer) { }
private controlContainer: ControlContainer) {
}
public ngOnInit() {
this.form = <FormGroup>this.controlContainer.control;
// this.toggleValidators();
this.qualities = [];
this.qualities.push({ name: "Please Select", id: -1 });

2
src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
View file

@ -8,11 +8,13 @@
<mat-tab-group dynamicHeight>
<mat-tab label="Radarr">
<ombi-settings-radarr-form
#normalForm
formGroupName="radarr">
</ombi-settings-radarr-form>
</mat-tab>
<mat-tab *ngIf="is4kEnabled" label="Radarr 4K">
<ombi-settings-radarr-form
#4kForm
formGroupName="radarr4K">
</ombi-settings-radarr-form>
</mat-tab>

16
src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
View file

@ -1,9 +1,10 @@
import { Component, OnInit } from "@angular/core";
import { Component, OnInit, QueryList, ViewChild, ViewChildren } from "@angular/core";
import { FormBuilder, FormGroup } from "@angular/forms";
import { IMinimumAvailability, IRadarrCombined, IRadarrProfile, IRadarrRootFolder } from "../../interfaces";
import { NotificationService, SettingsService } from "../../services";
import { FeaturesFacade } from "../../state/features/features.facade";
import { RadarrFormComponent } from "./components/radarr-form.component";
@Component({
templateUrl: "./radarr.component.html",
@ -19,11 +20,15 @@ export class RadarrComponent implements OnInit {
public form: FormGroup;
public is4kEnabled: boolean = false;
@ViewChildren('4kForm') public form4k: QueryList<RadarrFormComponent>;
@ViewChildren('normalForm') public normalForm: QueryList<RadarrFormComponent>;
constructor(private settingsService: SettingsService,
private notificationService: NotificationService,
private featureFacade: FeaturesFacade,
private fb: FormBuilder) { }
public ngOnInit() {
this.is4kEnabled = this.featureFacade.is4kEnabled();
this.settingsService.getRadarr()
@ -56,7 +61,16 @@ export class RadarrComponent implements OnInit {
scanForAvailability: [x.radarr4K.scanForAvailability]
}),
});
this.normalForm.changes.forEach((comp => {
comp.first.toggleValidators();
}))
if (this.is4kEnabled) {
this.form4k.changes.forEach((comp => {
comp.first.toggleValidators();
}))
}
});
}