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

Merge branch 'develop' into angular14

Browse source
This commit is contained in:
Jamie 2022-06-03 22:09:28 +01:00 • committed by GitHub
commit cb4ff1be62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
View file

@ -1,4 +1,4 @@
import { AfterViewInit, Component, OnInit, ViewChild, ViewEncapsulation } from "@angular/core"; import { Component, OnInit, ViewEncapsulation } from "@angular/core";
import { ImageService, SearchV2Service, RequestService, MessageService, RadarrService, SettingsStateService } from "../../../services"; import { ImageService, SearchV2Service, RequestService, MessageService, RadarrService, SettingsStateService } from "../../../services";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { DomSanitizer } from "@angular/platform-browser"; import { DomSanitizer } from "@angular/platform-browser";
@ -12,7 +12,6 @@ import { NewIssueComponent } from "../shared/new-issue/new-issue.component";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { MovieAdvancedOptionsComponent } from "./panels/movie-advanced-options/movie-advanced-options.component"; import { MovieAdvancedOptionsComponent } from "./panels/movie-advanced-options/movie-advanced-options.component";
import { RequestServiceV2 } from "../../../services/requestV2.service"; import { RequestServiceV2 } from "../../../services/requestV2.service";
import { RequestBehalfComponent } from "../shared/request-behalf/request-behalf.component";
import { firstValueFrom, forkJoin } from "rxjs"; import { firstValueFrom, forkJoin } from "rxjs";
import { AdminRequestDialogComponent } from "../../../shared/admin-request-dialog/admin-request-dialog.component"; import { AdminRequestDialogComponent } from "../../../shared/admin-request-dialog/admin-request-dialog.component";
import { FeaturesFacade } from "../../../state/features/features.facade"; import { FeaturesFacade } from "../../../state/features/features.facade";

13
src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts
View file

@ -1,13 +1,10 @@
import { Component, Inject, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { IDenyDialogData } from "../interfaces/interfaces"; import { MatDialogRef } from "@angular/material/dialog";
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { IdentityService } from "../../../../services";
import { RequestService, MessageService, IdentityService } from "../../../../services"; import { IUserDropdown } from "../../../../interfaces";
import { RequestType, IRequestEngineResult, IUserDropdown } from "../../../../interfaces";
import { UntypedFormControl } from "@angular/forms"; import { UntypedFormControl } from "@angular/forms";
import { Observable } from "rxjs"; import { Observable } from "rxjs";
import { filter, map, startWith } from "rxjs/operators"; import { map, startWith } from "rxjs/operators";
@Component({ @Component({
selector: "request-behalf", selector: "request-behalf",

2
src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.ts
View file

@ -96,7 +96,7 @@ export class AdminRequestDialogComponent implements OnInit {
public displayFn(user: IUserDropdown): string { public displayFn(user: IUserDropdown): string {
const username = user?.username ? user.username : ""; const username = user?.username ? user.username : "";
const email = user?.email ? `(${user.email})` : ""; const email = user?.email ? `(${user.email})` : "";
if (username && email) { if (username || email) {
return `${username} ${email}`; return `${username} ${email}`;
} }
return ''; return '';