github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-14 09:12:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #2147

Browse source
This commit is contained in:
Jamie Rees 2018-05-29 13:14:00 +01:00
parent f60fbcc6d7
commit d1de3f0888
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Ombi/Controllers/IssuesController.cs
View file

@ -133,7 +133,11 @@ namespace Ombi.Controllers
i.IssueCategory = null; i.IssueCategory = null;
i.UserReportedId = (await _userManager.Users.FirstOrDefaultAsync(x => x.UserName == User.Identity.Name)).Id; i.UserReportedId = (await _userManager.Users.FirstOrDefaultAsync(x => x.UserName == User.Identity.Name)).Id;
await _issues.Add(i); await _issues.Add(i);
var category = await _categories.GetAll().FirstOrDefaultAsync(x => i.IssueCategoryId == x.Id);
if (category != null)
{
i.IssueCategory = category;
}
var notificationModel = new NotificationOptions var notificationModel = new NotificationOptions
{ {
RequestId = i.RequestId ?? 0, RequestId = i.RequestId ?? 0,
@ -142,7 +146,7 @@ namespace Ombi.Controllers
RequestType = i.RequestType, RequestType = i.RequestType,
Recipient = string.Empty, Recipient = string.Empty,
AdditionalInformation = $"{i.Subject} | {i.Description}", AdditionalInformation = $"{i.Subject} | {i.Description}",
UserId = i.UserReportedId UserId = i.UserReportedId,
}; };
AddIssueNotificationSubstitutes(notificationModel, i, User.Identity.Name); AddIssueNotificationSubstitutes(notificationModel, i, User.Identity.Name);
@ -195,7 +199,7 @@ namespace Ombi.Controllers
{ {
var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName) var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
var issue = await _issues.GetAll().Include(x => x.UserReported).FirstOrDefaultAsync(x => x.Id == comment.IssueId); var issue = await _issues.GetAll().Include(x => x.UserReported).Include(x => x.IssueCategory).FirstOrDefaultAsync(x => x.Id == comment.IssueId);
if (issue == null) if (issue == null)
{ {
return null; return null;
@ -242,7 +246,7 @@ namespace Ombi.Controllers
{ {
var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName) var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
var issue = await _issues.GetAll().Include(x => x.UserReported).FirstOrDefaultAsync(x => x.Id == model.IssueId); var issue = await _issues.GetAll().Include(x => x.UserReported).Include(x => x.IssueCategory).FirstOrDefaultAsync(x => x.Id == model.IssueId);
if (issue == null) if (issue == null)
{ {
return false; return false;