diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs index fb7da9a87..e32f75766 100644 --- a/PlexRequests.Store/RequestedModel.cs +++ b/PlexRequests.Store/RequestedModel.cs @@ -33,10 +33,11 @@ namespace PlexRequests.Store public enum IssueState { - WrongAudio, - NoSubtitles, - WrongContent, - PlaybackIssues, - Other + None = 99, + WrongAudio = 0, + NoSubtitles = 1, + WrongContent = 2, + PlaybackIssues = 3, + Other = 4 // Provide a message } } diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index 1e63ede83..e216b0ee5 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -20,7 +20,7 @@ $('#approveAll').click(function () { dataType: "json", success: function (response) { if (checkJsonResponse(response)) { - generateNotify("Success!", "success"); + generateNotify("Success! All requests approved!", "success"); } }, error: function (e) { @@ -52,7 +52,7 @@ $(document).on("click", ".dropdownIssue", function (e) { dataType: "json", success: function (response) { if (checkJsonResponse(response)) { - generateNotify("Success!", "success"); + generateNotify("Success! Added Issue.", "success"); } }, error: function (e) { @@ -66,7 +66,7 @@ $(document).on("click", ".dropdownIssue", function (e) { $(".theSaveButton").click(function (e) { var comment = $("#commentArea").val(); e.preventDefault(); - var id = e.target.value; + var $form = $("#commentForm"); var data = $form.serialize(); data = data + "&issue=" + 4 + "&comment=" + comment; @@ -78,7 +78,7 @@ $(".theSaveButton").click(function (e) { dataType: "json", success: function (response) { if (checkJsonResponse(response)) { - generateNotify("Success!", "success"); + generateNotify("Success! Added Issue.", "success"); $("#myModal").modal("hide"); } }, @@ -100,6 +100,7 @@ $('#myModal').on('show.bs.modal', function (event) { requestField.val(id); // Add ID to the hidden field }); +// Delete $(document).on("click", ".delete", function (e) { e.preventDefault(); var buttonId = e.target.id; @@ -113,7 +114,7 @@ $(document).on("click", ".delete", function (e) { success: function (response) { if (checkJsonResponse(response)) { - generateNotify("Success!", "success"); + generateNotify("Success! Request Deleted.", "success"); $("#" + buttonId + "Template").slideUp(); } @@ -126,6 +127,32 @@ $(document).on("click", ".delete", function (e) { }); +// Clear issues +$(document).on("click", ".clear", function (e) { + e.preventDefault(); + var buttonId = e.target.id; + var $form = $('#clear' + buttonId); + + $.ajax({ + type: $form.prop('method'), + url: $form.prop('action'), + data: $form.serialize(), + dataType: "json", + success: function (response) { + + if (checkJsonResponse(response)) { + generateNotify("Success! Issues Cleared.", "info"); + $('#issueArea').html("
Issue: None
"); + } + }, + error: function (e) { + console.log(e); + generateNotify("Something went wrong!", "danger"); + } + }); + +}); + function movieLoad() { $("#movieList").html(""); diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs index 93a81ab2d..ff5aa0f8b 100644 --- a/PlexRequests.UI/Modules/RequestsModule.cs +++ b/PlexRequests.UI/Modules/RequestsModule.cs @@ -59,6 +59,8 @@ namespace PlexRequests.UI.Modules Post["/reportissue"] = _ => ReportIssue((int)Request.Form.requestId, (IssueState)(int)Request.Form.issue, null); Post["/reportissuecomment"] = _ => ReportIssue((int)Request.Form.requestId, IssueState.Other, (string)Request.Form.commentArea); + Post["/clearissues"] = _ => ClearIssue((int)Request.Form.requestId); + } private IRepositoryRequested By: {{requestedBy}}
Requested Date: {{requestedDate}}
- {{#if otherMessage}} -Message: {{otherMessage}}
- {{else}} -Issue: {{issues}}
- {{/if}} - +Message: {{otherMessage}}
+ {{else}} +Issue: {{issues}}
+ {{/if}} +