github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-13 18:16:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#273

Browse source
This commit is contained in:
tidusjar 2016-06-03 14:51:46 +01:00
commit 9d4881032d
3 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlexRequests.Core/Models/IssuesModel.cs
View file

@ -42,6 +42,7 @@ namespace PlexRequests.Core.Models
public List<IssueModel> Issues { get; set; }
public bool Deleted { get; set; }
public RequestType Type { get; set; }
public IssueStatus IssueStatus { get; set; }
}
public class IssueModel
@ -50,7 +51,6 @@ namespace PlexRequests.Core.Models
public string UserReported { get; set; }
public IssueState Issue { get; set; }
public string AdminNote { get; set; }
public IssueStatus IssueStatus { get; set; }
}
public enum IssueStatus

8
PlexRequests.Core/Setup.cs
View file

@ -57,13 +57,13 @@ namespace PlexRequests.Core
var version = CheckSchema();
if (version > 0)
{
if (version > 1700 && version <= 1799)
if (version > 1700 && version <= 1759)
{
MigrateToVersion1700();
}
if (version > 1800 && version <= 1899)
if (version > 1759 && version <= 1799)
{
MigrateToVersion1800();
MigrateToVersion1760();
}
}
@ -183,7 +183,7 @@ namespace PlexRequests.Core
/// <para>This includes updating the admin account to have all roles.</para>
/// <para>Set the log level to info</para>
/// </summary>
private void MigrateToVersion1800()
private void MigrateToVersion1760()
{
try
{

48
PlexRequests.UI/Modules/IssuesModule.cs
View file

@ -5,10 +5,14 @@ using System.Threading.Tasks;
using Nancy;
using Nancy.Responses.Negotiation;
using Nancy.Security;
using NLog;
using PlexRequests.Core;
using PlexRequests.Core.Models;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers;
using PlexRequests.Store;
using PlexRequests.UI.Models;
@ -23,22 +27,37 @@ namespace PlexRequests.UI.Modules
Get["/"] = x => Index();
Get["/issuecount", true] = async (x, ct) => await IssueCount();
Get["/{id}", true] = async (x, ct) => await Details(x.id);
Post["/issue", true] = async (x, ct) => await ReportIssue((int)Request.Form.requestId, (IssueState)(int)Request.Form.issue, null);
Get["/inprogress", true] = async (x, ct) => await GetInProgressIssues(IssueStatus.InProgressIssue);
Get["/pending", true] = async (x, ct) => await GetInProgressIssues(IssueStatus.PendingIssue);
Get["/resolved", true] = async (x, ct) => await GetInProgressIssues(IssueStatus.ResolvedIssue);
Post["/remove", true] = async (x, ct) => await RemoveIssue((int)Request.Form.issueId);
Get["/issuecount", true] = async (x, ct) => await IssueCount();
Post["/issuecomment", true] = async (x, ct) => await ReportIssue((int)Request.Form.requestId, IssueState.Other, (string)Request.Form.commentArea);
}
private IIssueService IssuesService { get; }
private IRequestService RequestService { get; }
private static Logger Log = LogManager.GetCurrentClassLogger();
public Negotiator Index()
{
return View["Index"];
}
private async Task<Response> GetInProgressIssues(IssueStatus status)
{
var issues = await IssuesService.GetAllAsync();
return Response.AsJson(issues.Where(x => x.IssueStatus == status));
}
public async Task<Response> IssueCount()
{
var issues = await IssuesService.GetAllAsync();
@ -52,7 +71,6 @@ namespace PlexRequests.UI.Modules
public async Task<Negotiator> Details(int id)
{
var issue = await IssuesService.GetAsync(id);
return issue == null
@ -66,7 +84,6 @@ namespace PlexRequests.UI.Modules
var model = new IssueModel
{
Issue = issue,
IssueStatus = IssueStatus.PendingIssue,
UserReported = Username,
UserNote = !string.IsNullOrEmpty(comment)
? $"{Username} - {comment}"
@ -95,7 +112,8 @@ namespace PlexRequests.UI.Modules
Title = request.Title,
PosterUrl = request.PosterPath,
RequestId = requestId,
Type = request.Type
Type = request.Type,
IssueStatus = IssueStatus.PendingIssue
};
issues.Issues.Add(model);
@ -130,6 +148,24 @@ namespace PlexRequests.UI.Modules
return myIssues;
}
private async Task<Response> RemoveIssue(int issueId)
{
try
{
this.RequiresClaims(UserClaims.PowerUser);
await IssuesService.DeleteIssueAsync(issueId);
return Response.AsJson(new JsonResponseModel {Result = true, Message = "Issue Removed"});
}
catch (Exception e)
{
Log.Error(e);
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Looks like we couldn't remove the issue. Check the logs!" });
}
}
}
}