FIXED!!!!! YES BITCH! #550

pull/579/head
tidusjar 8 years ago
parent 3e5e188e2c
commit c0e6030ba3

@ -147,7 +147,12 @@ namespace PlexRequests.Services.Jobs
sb.AppendFormat("<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2}</p></a>", sb.AppendFormat("<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2}</p></a>",
info.ImdbId, info.Title, info.ReleaseDate?.ToString("yyyy") ?? string.Empty); info.ImdbId, info.Title, info.ReleaseDate?.ToString("yyyy") ?? string.Empty);
sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>", string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())); if (info.Genres.Any())
{
sb.AppendFormat(
"<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>",
string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray()));
}
sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", info.Overview); sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", info.Overview);
sb.Append("<td"); sb.Append("<td");

@ -64,9 +64,12 @@ namespace PlexRequests.UI.Modules
var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin"; var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
return Session[SessionKeys.UsernameKey] == null if (Session[SessionKeys.UsernameKey] == null && Context?.CurrentUser == null)
? Context.GetRedirect(redirectPath) {
: null; return Context.GetRedirect(redirectPath);
}
return null;
} }
} }
} }

@ -65,8 +65,8 @@ namespace PlexRequests.UI.Modules
{ {
if (!string.IsNullOrEmpty(Username) || IsAdmin) if (!string.IsNullOrEmpty(Username) || IsAdmin)
{ {
var uri = Linker.BuildRelativeUri(Context, "SearchIndex"); var url = Linker.BuildAbsoluteUri(Context, "SearchIndex").ToString();
return Response.AsRedirect(uri.ToString()); return Response.AsRedirect(url);
} }
var settings = await AuthService.GetSettingsAsync(); var settings = await AuthService.GetSettingsAsync();
return View["Index", settings]; return View["Index", settings];

Loading…
Cancel
Save