diff --git a/RequestPlex.Core/SettingsService.cs b/RequestPlex.Core/SettingsService.cs
index 1362e4125..c0d5c1fe7 100644
--- a/RequestPlex.Core/SettingsService.cs
+++ b/RequestPlex.Core/SettingsService.cs
@@ -57,13 +57,14 @@ namespace RequestPlex.Core
model = new RequestedModel
{
- Tmdbid = tmdbid,
+ Tmdbid = movieInfo.Id,
Type = type,
Overview = movieInfo.Overview,
ImdbId = movieInfo.ImdbId,
PosterPath = "http://image.tmdb.org/t/p/w150/" + movieInfo.PosterPath,
Title = movieInfo.Title,
- ReleaseDate = movieInfo.ReleaseDate ?? DateTime.MinValue
+ ReleaseDate = movieInfo.ReleaseDate ?? DateTime.MinValue,
+ Status = movieInfo.Status
};
}
else
@@ -72,13 +73,13 @@ namespace RequestPlex.Core
model = new RequestedModel
{
- Tmdbid = tmdbid,
+ Tmdbid = showInfo.Id,
Type = type,
Overview = showInfo.Overview,
- //ImdbId = showInfo.ImdbId, //TODO where's the IMDBId?
PosterPath = "http://image.tmdb.org/t/p/w150/" + showInfo.PosterPath,
Title = showInfo.Name,
- ReleaseDate = showInfo.FirstAirDate ?? DateTime.MinValue
+ ReleaseDate = showInfo.FirstAirDate ?? DateTime.MinValue,
+ Status = showInfo.Status
};
}
var db = new DbConfiguration(new SqliteFactory());
diff --git a/RequestPlex.Store/RequestedModel.cs b/RequestPlex.Store/RequestedModel.cs
index 1b4cfb66e..d62cd9b7c 100644
--- a/RequestPlex.Store/RequestedModel.cs
+++ b/RequestPlex.Store/RequestedModel.cs
@@ -15,6 +15,7 @@ namespace RequestPlex.Store
public string PosterPath { get; set; }
public DateTime ReleaseDate { get; set; }
public RequestType Type { get; set; }
+ public string Status { get; set; }
}
public enum RequestType
diff --git a/RequestPlex.Store/SqlTables.sql b/RequestPlex.Store/SqlTables.sql
index 16d66320c..b0e9bb2a7 100644
--- a/RequestPlex.Store/SqlTables.sql
+++ b/RequestPlex.Store/SqlTables.sql
@@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS Requested
Title varchar(50) NOT NULL,
PosterPath varchar(50) NOT NULL,
ReleaseDate varchar(50) NOT NULL
+ Status varchar(50) NOT NULL
);
CREATE TABLE IF NOT EXISTS GlobalSettings
diff --git a/RequestPlex.UI/Content/requests.js b/RequestPlex.UI/Content/requests.js
index 15295a169..bf68b194b 100644
--- a/RequestPlex.UI/Content/requests.js
+++ b/RequestPlex.UI/Content/requests.js
@@ -48,7 +48,8 @@ function buildMovieRequestContext(result) {
title: result.title,
overview: result.overview,
year: year,
- type: "movie"
+ type: "movie",
+ status: result.status
};
return context;
@@ -62,10 +63,9 @@ function buildTvShowRequestContext(result) {
id: result.tmdbid,
title: result.name,
overview: result.overview,
- voteCount: result.voteCount,
- voteAverage: result.voteAverage,
year: year,
- type: "tv"
+ type: "tv",
+ status: result.status
};
return context;
}
diff --git a/RequestPlex.UI/Properties/AssemblyInfo.cs b/RequestPlex.UI/Properties/AssemblyInfo.cs
index 76144376a..b8d2fa452 100644
--- a/RequestPlex.UI/Properties/AssemblyInfo.cs
+++ b/RequestPlex.UI/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RequestPlex.UI")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RequestPlex.UI/RequestPlex.UI.csproj b/RequestPlex.UI/RequestPlex.UI.csproj
index 305d9cb2f..48a5d21a8 100644
--- a/RequestPlex.UI/RequestPlex.UI.csproj
+++ b/RequestPlex.UI/RequestPlex.UI.csproj
@@ -8,11 +8,26 @@
Exe
Properties
RequestPlex.UI
- RequestPlex.UI
+ RequestPlex
v4.5.2
512
..\..\
true
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
AnyCPU
@@ -23,6 +38,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -84,9 +100,11 @@
True
+
+
True
..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll
@@ -228,6 +246,18 @@
PreserveNewest
+
+
+ False
+ Microsoft .NET Framework 4.5.2 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
diff --git a/RequestPlex.UI/Views/Requests/Index.cshtml b/RequestPlex.UI/Views/Requests/Index.cshtml
index 817615243..87fc33bbd 100644
--- a/RequestPlex.UI/Views/Requests/Index.cshtml
+++ b/RequestPlex.UI/Views/Requests/Index.cshtml
@@ -48,6 +48,7 @@
{{overview}}