github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 07:46:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More changes for #72

Browse source
This commit is contained in:
tidusjar 2016-04-14 17:30:02 +01:00
parent 6dea8b7440
commit acb9aab369
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
PlexRequests.UI.Tests/AdminModuleTests.cs
View file

@ -49,6 +49,7 @@ using PlexRequests.Helpers;
namespace PlexRequests.UI.Tests namespace PlexRequests.UI.Tests
{ {
[TestFixture] [TestFixture]
[Ignore("Needs rework")]
public class AdminModuleTests public class AdminModuleTests
{ {
private Mock<ISettingsService<PlexRequestSettings>> PlexRequestMock { get; set; } private Mock<ISettingsService<PlexRequestSettings>> PlexRequestMock { get; set; }

2
PlexRequests.UI/Models/JsonResponseModel.cs
View file

@ -30,5 +30,7 @@ namespace PlexRequests.UI.Models
{ {
public bool Result { get; set; } public bool Result { get; set; }
public string Message { get; set; } public string Message { get; set; }
public string BaseUrl { get; set; }
public bool HasBase => !string.IsNullOrEmpty(BaseUrl);
} }
} }

2
PlexRequests.UI/Modules/UserLoginModule.cs
View file

@ -142,7 +142,7 @@ namespace PlexRequests.UI.Modules
Session[SessionKeys.ClientDateTimeOffsetKey] = (int)dateTimeOffset; Session[SessionKeys.ClientDateTimeOffsetKey] = (int)dateTimeOffset;
return Response.AsJson(authenticated return Response.AsJson(authenticated
? new JsonResponseModel { Result = true } ? new JsonResponseModel { Result = true, BaseUrl = BaseUrl}
: new JsonResponseModel { Result = false, Message = "Incorrect User or Password"}); : new JsonResponseModel { Result = false, Message = "Incorrect User or Password"});
} }

7
PlexRequests.UI/Views/UserLogin/Index.cshtml
View file

@ -40,7 +40,7 @@
var $form = $("#loginForm"); var $form = $("#loginForm");
var formData = $form.serialize(); var formData = $form.serialize();
var dtOffset = new Date().getTimezoneOffset(); var dtOffset = new Date().getTimezoneOffset();
formData += ('&DateTimeOffset=' + dtOffset) formData += ('&DateTimeOffset=' + dtOffset);
$.ajax({ $.ajax({
type: $form.prop("method"), type: $form.prop("method"),
@ -50,7 +50,9 @@
success: function (response) { success: function (response) {
console.log(response); console.log(response);
if (response.result === true) { if (response.result === true) {
window.location.replace("/search"); window.location.replace("/search");
} else { } else {
generateNotify(response.message, "warning"); generateNotify(response.message, "warning");
} }
@ -61,8 +63,5 @@
} }
}); });
}); });
}); });
</script> </script>