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

missing

Browse source
This commit is contained in:
tidusjar 2016-05-17 20:37:08 +01:00
parent 437a28b108
commit f0b63e0fdd
2 changed files with 51 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -120,7 +120,7 @@ namespace PlexRequests.UI.Modules
{
dbMovies = t.Result.ToList();
if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{
dbMovies = dbMovies.Where(x => x.UserHasRequested(Username)).ToList();
}
@ -167,10 +167,10 @@ namespace PlexRequests.UI.Modules
Approved = movie.Available || movie.Approved,
Title = movie.Title,
Overview = movie.Overview,
RequestedUsers = isAdmin ? movie.AllUsers.ToArray() : new string[] { },
RequestedUsers = IsAdmin ? movie.AllUsers.ToArray() : new string[] { },
ReleaseYear = movie.ReleaseDate.Year.ToString(),
Available = movie.Available,
Admin = isAdmin,
Admin = IsAdmin,
Issues = movie.Issues.ToString().CamelCaseToWords(),
OtherMessage = movie.OtherMessage,
AdminNotes = movie.AdminNote,
@ -268,7 +268,7 @@ namespace PlexRequests.UI.Modules
{
var settings = PrSettings.GetSettings();
var dbAlbum = Service.GetAll().Where(x => x.Type == RequestType.Album);
if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{
dbAlbum = dbAlbum.Where(x => x.UserHasRequested(Username));
}

34
PlexRequests.UI/Modules/UserManagementModule.cs
View file

@ -17,25 +17,27 @@ namespace PlexRequests.UI
{
public class UserManagementModule : BaseModule
{
public UserManagementModule () : base("usermanagement")
public UserManagementModule() : base("usermanagement")
{
this.RequiresClaims (UserClaims.Admin);
this.RequiresClaims(UserClaims.Admin);
Get["/"] = x => Load();
Get ["/users"] = x => LoadUsers ();
Get["/users"] = x => LoadUsers();
}
private Negotiator Load()
{
return View ["Index"];
return View["Index"];
}
private Response LoadUsers()
{
var users = UserMapper.GetUsers ();
var users = UserMapper.GetUsers();
var model = new List<UserManagementUsersViewModel>();
foreach (var user in users) {
model.Add (new UserManagementUsersViewModel {
foreach (var user in users)
{
model.Add(new UserManagementUsersViewModel
{
//Claims = ByteConverterHelper.ReturnObject<string[]>(user.Claims),
Claims = "test",
Id = user.Id,
@ -43,23 +45,27 @@ namespace PlexRequests.UI
//Type = UserType.LocalUser
});
}
return Response.AsJson (users);
return Response.AsJson(users);
}
private Response CreateUser(string username, string password, string claims)
{
if (string.IsNullOrWhiteSpace (username) || string.IsNullOrWhiteSpace (password)) {
return Response.AsJson (new JsonResponseModel {
if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
{
return Response.AsJson(new JsonResponseModel
{
Result = true,
Message = "Please enter in a valid Username and Password"
});
}
var user = UserMapper.CreateUser (username, password, new string[]{ claims });
if(user.HasValue){
return Response.AsJson(new JsonResponseModel{ Result = true});
var user = UserMapper.CreateUser(username, password, new string[] {claims});
if (user.HasValue)
{
return Response.AsJson(new JsonResponseModel {Result = true});
}
return Response.AsJson(new JsonResponseModel{ Result = false, Message = "Could not save user"});
return Response.AsJson(new JsonResponseModel {Result = false, Message = "Could not save user"});
}
}
}