github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-30 03:28:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a issue with the proxy and also fixed build

Browse source
This commit is contained in:
Jamie Rees 2019-04-04 22:51:53 +01:00
parent 91e1db06f2
commit a1e0042966
6 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
View file

@ -51,7 +51,9 @@ namespace Ombi.Core.Engine.V2
langCode = await DefaultLanguageCode(langCode); langCode = await DefaultLanguageCode(langCode);
var collections = await MovieApi.GetCollection(langCode, collectionId); var collections = await MovieApi.GetCollection(langCode, collectionId);
return await ProcessCollection(collections); var c = await ProcessCollection(collections);
c.Collection = c.Collection.OrderBy(x => x.ReleaseDate).ToList();
return c;
} }
public async Task<int> GetTvDbId(int theMovieDbId) public async Task<int> GetTvDbId(int theMovieDbId)
@ -208,6 +210,7 @@ namespace Ombi.Core.Engine.V2
mapped.EmbyUrl = movie.EmbyUrl; mapped.EmbyUrl = movie.EmbyUrl;
mapped.Subscribed = movie.Subscribed; mapped.Subscribed = movie.Subscribed;
mapped.ShowSubscribe = movie.ShowSubscribe; mapped.ShowSubscribe = movie.ShowSubscribe;
mapped.ReleaseDate = movie.ReleaseDate;
} }
return viewMovie; return viewMovie;
} }

4
src/Ombi.Core/Models/Search/V2/MovieCollectionsViewModel.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic; using System;
using System.Collections.Generic;
using Ombi.Store.Entities; using Ombi.Store.Entities;
namespace Ombi.Core.Models.Search.V2 namespace Ombi.Core.Models.Search.V2
@ -16,6 +17,7 @@ namespace Ombi.Core.Models.Search.V2
public string Overview { get; set; } public string Overview { get; set; }
public string PosterPath { get; set; } public string PosterPath { get; set; }
public string Title { get; set; } public string Title { get; set; }
public DateTime ReleaseDate { get; set; }
public override RequestType Type => RequestType.Movie; public override RequestType Type => RequestType.Movie;

2
src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
View file

@ -17,5 +17,5 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-actions> <div mat-dialog-actions>
<button mat-button [mat-dialog-close]="selectedRadarrProfile" cdkFocusInitial>Ok</button> <button mat-button [mat-dialog-close]="options" cdkFocusInitial>Ok</button>
</div> </div>

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

@ -7,7 +7,7 @@
<a *ngIf="nav.requiresAdmin && isAdmin || !nav.requiresAdmin" mat-list-item [routerLink]="nav.link" <a *ngIf="nav.requiresAdmin && isAdmin || !nav.requiresAdmin" mat-list-item [routerLink]="nav.link"
[routerLinkActive]="getTheme()" > [routerLinkActive]="getTheme()" >
<mat-icon aria-label="Side nav toggle icon">{{nav.icon}}</mat-icon> <mat-icon aria-label="Side nav toggle icon">{{nav.icon}}</mat-icon>
{{nav.name | translate}} &nbsp;{{nav.name | translate}}
</a> </span> </a> </span>
<a class="bottom-nav-link" mat-list-item [routerLinkActive]="theme === 'dark' ? 'active-list-item-dark' : 'active-list-item'" aria-label="Toggle sidenav" (click)="logOut();"> <a class="bottom-nav-link" mat-list-item [routerLinkActive]="theme === 'dark' ? 'active-list-item-dark' : 'active-list-item'" aria-label="Toggle sidenav" (click)="logOut();">

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

@ -38,7 +38,7 @@ export class MyNavComponent implements OnInit {
{ name: "NavigationBar.Discover", icon: "find_replace", link: "/discover", requiresAdmin: false }, { name: "NavigationBar.Discover", icon: "find_replace", link: "/discover", requiresAdmin: false },
{ name: "NavigationBar.Requests", icon: "list", link: "/requests-list", requiresAdmin: false }, { name: "NavigationBar.Requests", icon: "list", link: "/requests-list", requiresAdmin: false },
{ name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true }, { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true },
{ name: "NavigationBar.Calendar", icon: "calendar", link: "/calendar", requiresAdmin: false }, { name: "NavigationBar.Calendar", icon: "calendar_today", link: "/calendar", requiresAdmin: false },
{ name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true }, { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true },
] ]

25
src/Ombi/ClientApp/src/index.html
View file

@ -4,10 +4,31 @@
<head> <head>
<script> <script>
// manually sets the <base> tag's href attribute so the app can be located in places other than root // manually sets the <base> tag's href attribute so the app can be located in places other than root
debugger;
var split = location.pathname.split('/'); var split = location.pathname.split('/');
var base = ""; var base = "";
var invalidProxies = ['DISCOVER',
'REQUESTS-LIST',
'DETAILS',
'SETTINGS',
'ISSUES',
'USERMANAGEMENT',
'RECENTLYADDED',
'DETAILS',
'VOTE',
'LOGIN',
'LANDINGPAGE',
'TOKEN',
'RESET',
'CUSTOM',
'AUTH',
'WIZARD',
"CALENDAR"
]
for (var i = 0; i < split.length - 1; i++) { for (var i = 0; i < split.length - 1; i++) {
if( invalidProxies.indexOf(split[i].toUpperCase()) !== -1) {
break;
}
base += split[i]; base += split[i];
if(base.length > 1) { if(base.length > 1) {
break; break;
@ -17,7 +38,7 @@
} }
} }
if(base === "") { if(base === "") {
base = "./"; base = "/";
} }
window['_app_base'] = base; window['_app_base'] = base;
document.write("<base href='" + base + "' />"); document.write("<base href='" + base + "' />");