diff --git a/src/Ombi.Helpers/AssemblyHelper.cs b/src/Ombi.Helpers/AssemblyHelper.cs index 51b66d8c9..5d3bb5bf5 100644 --- a/src/Ombi.Helpers/AssemblyHelper.cs +++ b/src/Ombi.Helpers/AssemblyHelper.cs @@ -1,13 +1,15 @@ -using System; -using System.Reflection; +using System.Reflection; namespace Ombi.Helpers { public static class AssemblyHelper { - public static string GetRuntimeVersion() => - Assembly.GetEntryAssembly() + public static string GetRuntimeVersion() + { + var version = Assembly.GetEntryAssembly() .GetCustomAttribute() .InformationalVersion; + return version.Equals("1.0.0") ? "3.0.0-DotNetCore" : version; + } } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/app/services/update.service.ts b/src/Ombi/ClientApp/app/services/update.service.ts index 68fe42f28..b6184dc76 100644 --- a/src/Ombi/ClientApp/app/services/update.service.ts +++ b/src/Ombi/ClientApp/app/services/update.service.ts @@ -1,5 +1,4 @@ import { Injectable } from "@angular/core"; -import { Http } from "@angular/http"; import { AuthHttp } from "angular2-jwt"; import { Observable } from "rxjs/Rx"; @@ -7,11 +6,11 @@ import { ServiceAuthHelpers } from "./service.helpers"; @Injectable() export class UpdateService extends ServiceAuthHelpers { - constructor(http: AuthHttp, private regularHttp: Http) { - super(http, "/api/v1/Jobs/"); + constructor(http: AuthHttp) { + super(http, "/api/v1/Job/"); } public forceUpdate(): Observable { - return this.regularHttp.post(`${this.url}update/`, { headers: this.headers }).map(this.extractData); + return this.http.post(`${this.url}update/`, { headers: this.headers }).map(this.extractData); } public checkForNewUpdate(): Observable { diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html index 644688c43..ba196beff 100644 --- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html +++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html @@ -67,7 +67,7 @@ System diff --git a/src/Ombi/ClientApp/app/settings/update/update.component.html b/src/Ombi/ClientApp/app/settings/update/update.component.html index 2332940ec..5201e163e 100644 --- a/src/Ombi/ClientApp/app/settings/update/update.component.html +++ b/src/Ombi/ClientApp/app/settings/update/update.component.html @@ -3,7 +3,14 @@
Update Settings - +
+
+ +
+
+ +
+
@@ -13,16 +20,7 @@
-
-
- -
-
-
-
- -
-
+
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 545926557..74b535f5c 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -19,6 +19,7 @@ bin\Release\netcoreapp2.0\Swagger.xml 1701;1702;1705;1591; + TRACE;RELEASE;NETCOREAPP2_0