github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-10 15:32:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

show the requested by user from legacy request models

Browse source
This commit is contained in:
Drewster727 2016-03-29 13:52:44 -05:00
parent b8a01b62b9
commit cee7bee024
1 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

102
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -87,28 +87,34 @@ namespace PlexRequests.UI.Modules
dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString())); dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
} }
var viewModel = dbMovies.Select(movie => new RequestViewModel var viewModel = dbMovies.Select(movie => {
{ if (!string.IsNullOrEmpty(movie.RequestedBy) && !movie.RequestedUsers.Any(x => x.Equals(movie.RequestedBy, StringComparison.OrdinalIgnoreCase)))
ProviderId = movie.ProviderId, {
Type = movie.Type, movie.RequestedUsers.Add(movie.RequestedBy);
Status = movie.Status, }
ImdbId = movie.ImdbId, return new RequestViewModel
Id = movie.Id, {
PosterPath = movie.PosterPath, ProviderId = movie.ProviderId,
ReleaseDate = movie.ReleaseDate.Humanize(), Type = movie.Type,
ReleaseDateTicks = movie.ReleaseDate.Ticks, Status = movie.Status,
RequestedDate = movie.RequestedDate.Humanize(), ImdbId = movie.ImdbId,
RequestedDateTicks = movie.RequestedDate.Ticks, Id = movie.Id,
Approved = movie.Available || movie.Approved, PosterPath = movie.PosterPath,
Title = movie.Title, ReleaseDate = movie.ReleaseDate.Humanize(),
Overview = movie.Overview, ReleaseDateTicks = movie.ReleaseDate.Ticks,
RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { }, RequestedDate = movie.RequestedDate.Humanize(),
ReleaseYear = movie.ReleaseDate.Year.ToString(), RequestedDateTicks = movie.RequestedDate.Ticks,
Available = movie.Available, Approved = movie.Available || movie.Approved,
Admin = isAdmin, Title = movie.Title,
Issues = movie.Issues.Humanize(LetterCasing.Title), Overview = movie.Overview,
OtherMessage = movie.OtherMessage, RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
AdminNotes = movie.AdminNote ReleaseYear = movie.ReleaseDate.Year.ToString(),
Available = movie.Available,
Admin = isAdmin,
Issues = movie.Issues.Humanize(LetterCasing.Title),
OtherMessage = movie.OtherMessage,
AdminNotes = movie.AdminNote
};
}).ToList(); }).ToList();
return Response.AsJson(viewModel); return Response.AsJson(viewModel);
@ -124,29 +130,35 @@ namespace PlexRequests.UI.Modules
dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString())); dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
} }
var viewModel = dbTv.Select(tv => new RequestViewModel var viewModel = dbTv.Select(tv => {
{ if (!string.IsNullOrEmpty(tv.RequestedBy) && !tv.RequestedUsers.Any(x => x.Equals(tv.RequestedBy, StringComparison.OrdinalIgnoreCase)))
ProviderId = tv.ProviderId, {
Type = tv.Type, tv.RequestedUsers.Add(tv.RequestedBy);
Status = tv.Status, }
ImdbId = tv.ImdbId, return new RequestViewModel
Id = tv.Id, {
PosterPath = tv.PosterPath, ProviderId = tv.ProviderId,
ReleaseDate = tv.ReleaseDate.Humanize(), Type = tv.Type,
ReleaseDateTicks = tv.ReleaseDate.Ticks, Status = tv.Status,
RequestedDate = tv.RequestedDate.Humanize(), ImdbId = tv.ImdbId,
RequestedDateTicks = tv.RequestedDate.Ticks, Id = tv.Id,
Approved = tv.Available || tv.Approved, PosterPath = tv.PosterPath,
Title = tv.Title, ReleaseDate = tv.ReleaseDate.Humanize(),
Overview = tv.Overview, ReleaseDateTicks = tv.ReleaseDate.Ticks,
RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { }, RequestedDate = tv.RequestedDate.Humanize(),
ReleaseYear = tv.ReleaseDate.Year.ToString(), RequestedDateTicks = tv.RequestedDate.Ticks,
Available = tv.Available, Approved = tv.Available || tv.Approved,
Admin = isAdmin, Title = tv.Title,
Issues = tv.Issues.Humanize(LetterCasing.Title), Overview = tv.Overview,
OtherMessage = tv.OtherMessage, RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
AdminNotes = tv.AdminNote, ReleaseYear = tv.ReleaseDate.Year.ToString(),
TvSeriesRequestType = tv.SeasonsRequested Available = tv.Available,
Admin = isAdmin,
Issues = tv.Issues.Humanize(LetterCasing.Title),
OtherMessage = tv.OtherMessage,
AdminNotes = tv.AdminNote,
TvSeriesRequestType = tv.SeasonsRequested
};
}).ToList(); }).ToList();
return Response.AsJson(viewModel); return Response.AsJson(viewModel);