diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index 0cce7af58..9fd6033bf 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -491,6 +491,12 @@ namespace Ombi.Core.Engine
if (user == null)
{
user = await GetUser();
+
+ // If user is still null after attempting to get the logged in user, return null.
+ if (user == null)
+ {
+ return null;
+ }
}
int limit = user.MovieRequestLimit ?? 0;
diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
index a700035a0..6a7f370d9 100644
--- a/src/Ombi.Core/Engine/TvRequestEngine.cs
+++ b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -620,6 +620,12 @@ namespace Ombi.Core.Engine
if (user == null)
{
user = await GetUser();
+
+ // If user is still null after attempting to get the logged in user, return null.
+ if (user == null)
+ {
+ return null;
+ }
}
int limit = user.EpisodeRequestLimit ?? 0;
diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html
index 98bc8749b..431ea7ddf 100644
--- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html
@@ -93,18 +93,18 @@
- Movies: {{u.movieRequestQuota.remaining}}/{{u.movieRequestLimit}} remaining
+ {{'UserManagment.MovieRemaining' | translate: {remaining: u.movieRequestQuota.remaining, total: u.movieRequestLimit} }}
- TV: {{u.episodeRequestQuota.remaining}}/{{u.episodeRequestLimit}} remaining
+ {{'UserManagment.TvRemaining' | translate: {remaining: u.episodeRequestQuota.remaining, total: u.episodeRequestLimit} }}
|
- Movie: {{u.movieRequestQuota.nextRequest | date: 'short'}}
+ {{'UserManagment.MovieDue' | translate: {date: (u.movieRequestQuota.nextRequest | date: 'short')} }}
- TV: {{u.episodeRequestQuota.nextRequest | date: 'short'}}
+ {{'UserManagment.TvDue' | translate: {date: (u.episodeRequestQuota.nextRequest | date: 'short')} }}
|
diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
index cf25446f5..1a91cf295 100644
--- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
+++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
@@ -19,6 +19,8 @@ import { AuthGuard } from "../auth/auth.guard";
import { OrderModule } from "ngx-order-pipe";
import { AddPlexUserComponent } from "./addplexuser.component";
+import { SharedModule } from "../shared/shared.module";
+
const routes: Routes = [
{ path: "", component: UserManagementComponent, canActivate: [AuthGuard] },
{ path: "add", component: UserManagementAddComponent, canActivate: [AuthGuard] },
@@ -39,6 +41,7 @@ const routes: Routes = [
TooltipModule,
OrderModule,
SidebarModule,
+ SharedModule,
],
declarations: [
UserManagementComponent,
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index b38f5fb95..c53229c3d 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -184,5 +184,11 @@
"FilterHeaderRequestStatus":"Status",
"Approved":"Approved",
"PendingApproval": "Pending Approval"
+ },
+ "UserManagment": {
+ "TvRemaining": "TV: {{remaining}}/{{total}} remaining",
+ "MovieRemaining": "Movies: {{remaining}}/{{total}} remaining",
+ "TvDue": "TV: {{date}}",
+ "MovieDue": "Movie: {{date}}"
}
}
|