From 68078271d94455d8eb9fb3a9b2e466ea5507e43f Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 25 Feb 2021 22:20:43 +0000
Subject: [PATCH] Small improvements

---
 src/Ombi.Core/Models/UI/UserViewModel.cs              |  2 ++
 src/Ombi/ClientApp/src/app/interfaces/IUser.ts        |  1 +
 .../components/movie/movie-details.component.ts       |  1 -
 .../movie-advanced-options.component.html             |  4 ++--
 .../request-behalf/request-behalf.component.html      | 11 ++++++-----
 .../shared/request-behalf/request-behalf.component.ts |  4 +++-
 src/Ombi/ClientApp/src/styles/material-overrides.scss |  3 ++-
 src/Ombi/Controllers/V1/IdentityController.cs         |  3 ++-
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Ombi.Core/Models/UI/UserViewModel.cs b/src/Ombi.Core/Models/UI/UserViewModel.cs
index 0c9be846a..7ce2f7e7c 100644
--- a/src/Ombi.Core/Models/UI/UserViewModel.cs
+++ b/src/Ombi.Core/Models/UI/UserViewModel.cs
@@ -36,5 +36,7 @@ namespace Ombi.Core.Models.UI
     {
         public string Id { get; set; }
         public string Username { get; set; }
+        public string Email { get; set; }
+
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/interfaces/IUser.ts b/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
index 856d57f0a..148c5791b 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IUser.ts
@@ -28,6 +28,7 @@ export interface IUser {
 export interface IUserDropdown {
     username: string;
     id: string;
+    email: string;
 }
 
 export interface IUserQualityProfiles {
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
index 2571d7eb8..a9bdf073a 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
@@ -190,7 +190,6 @@ export class MovieDetailsComponent {
         const folders = this.radarrService.getRootFoldersFromSettings();
 
         forkJoin([profile, folders]).subscribe(x => {
-            debugger;
             const radarrProfiles = x[0];
             const radarrRootFolders = x[1];
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
index e839b49b1..b7d3d6b40 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
@@ -2,7 +2,7 @@
 
     Advanced Options</h1>
 <div mat-dialog-content>
-    <mat-form-field>
+    <mat-form-field appearance="outline" floatLabel=auto>
         <mat-label>{{'MediaDetails.QualityProfilesSelect' | translate }}</mat-label>
         <mat-select [(value)]="data.profileId">
             <mat-option *ngFor="let profile of radarrProfiles" value="{{profile.id}}">{{profile.name}}</mat-option>
@@ -10,7 +10,7 @@
     </mat-form-field>
 </div>
 <div mat-dialog-content>
-    <mat-form-field>
+    <mat-form-field appearance="outline" floatLabel=auto>
         <mat-label>{{'MediaDetails.RootFolderSelect' | translate }}</mat-label>
         <mat-select [(value)]="data.rootFolderId">
             <mat-option *ngFor="let profile of radarrRootFolders" value="{{profile.id}}">{{profile.path}}</mat-option>
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.html
index db7acde9d..b7788f827 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.html
@@ -1,22 +1,23 @@
 <h1 mat-dialog-title>{{ 'MediaDetails.RequestOnBehalf' | translate}}</h1>
 <div mat-dialog-content>
   <form class="example-form">
-    <mat-form-field class="example-full-width">
+    <mat-form-field class="example-full-width" appearance="outline" floatLabel=auto>
+      <mat-label>{{ 'MediaDetails.PleaseSelectUser' | translate}}</mat-label>
       <input type="text"
-             placeholder="{{ 'MediaDetails.PleaseSelectUser' | translate}}"
              aria-label="Number"
              matInput
              [formControl]="myControl"
              [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
         <mat-option *ngFor="let option of filteredOptions | async" [value]="option">
-          {{option.username}}
+          {{displayFn(option)}}
         </mat-option>
       </mat-autocomplete>
     </mat-form-field>
   </form>
 </div>
 <div mat-dialog-actions>
-  <button mat-raised-button (click)="onNoClick()"> Cancel</button>
+  <button mat-raised-button (click)="onNoClick()">{{'Common.Cancel' | translate}}</button>
   <button mat-raised-button (click)="request()" color="accent" [mat-dialog-close]="userId" cdkFocusInitial>{{'Common.Request' | translate}}</button>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts
index da684db06..454ad3ee4 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts
@@ -41,7 +41,9 @@ export class RequestBehalfComponent implements OnInit {
     }
 
     public displayFn(user: IUserDropdown): string {
-        return user?.username ? user.username : '';
+        const username = user?.username ? user.username : '';
+        const email = user?.email ? `(${user.email})` : '';
+        return `${username} ${email}`;
       }
 
     private _filter(value: string|IUserDropdown): IUserDropdown[] {
diff --git a/src/Ombi/ClientApp/src/styles/material-overrides.scss b/src/Ombi/ClientApp/src/styles/material-overrides.scss
index e020b0532..cbc03782e 100644
--- a/src/Ombi/ClientApp/src/styles/material-overrides.scss
+++ b/src/Ombi/ClientApp/src/styles/material-overrides.scss
@@ -27,7 +27,8 @@ td.mat-cell {
 .mat-dialog-container,
 .mat-menu-content,
 .mat-table,
-.mat-paginator {
+.mat-paginator,
+.mat-select-panel {
     background: $ombi-background-accent;
 }
 
diff --git a/src/Ombi/Controllers/V1/IdentityController.cs b/src/Ombi/Controllers/V1/IdentityController.cs
index 342e4620d..dfe13a029 100644
--- a/src/Ombi/Controllers/V1/IdentityController.cs
+++ b/src/Ombi/Controllers/V1/IdentityController.cs
@@ -299,7 +299,8 @@ namespace Ombi.Controllers.V1
                 model.Add(new UserViewModelDropdown
                 {
                     Id = user.Id,
-                    Username = user.UserName
+                    Username = user.UserName,
+                    Email = user.Email
                 });
             }