github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 21:33:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finished #707

Browse source
This commit is contained in:
Jamie.Rees 2016-11-28 08:26:12 +00:00
commit 21f3131cb4
14 changed files with 58 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -335,7 +335,7 @@ namespace PlexRequests.UI.Modules
myIssues = issuesModels.Where(x => x.IssueStatus != IssueStatus.ResolvedIssue);
}
}
else if (settings.UsersCanViewOnlyOwnIssues) // The user is not an Admin, do we have the settings to hide them?
else if (Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnIssues)) // The user is not an Admin, do we have the settings to hide them?
{
if (!showResolved)
{

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

@ -129,7 +129,7 @@ namespace PlexRequests.UI.Modules
var dbMovies = allRequests.ToList();
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
if (Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests) && !IsAdmin)
{
dbMovies = dbMovies.Where(x => x.UserHasRequested(Username)).ToList();
}
@ -199,7 +199,7 @@ namespace PlexRequests.UI.Modules
var dbTv = requests;
var settings = await settingsTask;
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
if (Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests) && !IsAdmin)
{
dbTv = dbTv.Where(x => x.UserHasRequested(Username)).ToList();
}
@ -271,7 +271,7 @@ namespace PlexRequests.UI.Modules
var settings = PrSettings.GetSettings();
var dbAlbum = await Service.GetAllAsync();
dbAlbum = dbAlbum.Where(x => x.Type == RequestType.Album);
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
if (Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests) && !IsAdmin)
{
dbAlbum = dbAlbum.Where(x => x.UserHasRequested(Username));
}

17
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -278,7 +278,7 @@ namespace PlexRequests.UI.Modules
VoteAverage = movie.VoteAverage,
VoteCount = movie.VoteCount
};
var canSee = CanUserSeeThisRequest(viewMovie.Id, settings.UsersCanViewOnlyOwnRequests, dbMovies);
var canSee = CanUserSeeThisRequest(viewMovie.Id, Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests), dbMovies);
var plexMovie = Checker.GetMovie(plexMovies.ToArray(), movie.Title, movie.ReleaseDate?.Year.ToString(),
imdbId);
if (plexMovie != null)
@ -510,7 +510,7 @@ namespace PlexRequests.UI.Modules
{
Result = true,
Message =
settings.UsersCanViewOnlyOwnRequests
Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests)
? $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}"
: $"{fullMovieName} {Resources.UI.Search_AlreadyRequested}"
});
@ -968,7 +968,7 @@ namespace PlexRequests.UI.Modules
{
existingRequest.RequestedUsers.Add(Username);
}
if (settings.UsersCanViewOnlyOwnRequests || episodeReq)
if (Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests) || episodeReq)
{
return
await
@ -1033,7 +1033,7 @@ namespace PlexRequests.UI.Modules
{
Result = true,
Message =
settings.UsersCanViewOnlyOwnRequests
Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests)
? $"{existingRequest.Title} {Resources.UI.Search_SuccessfullyAdded}"
: $"{existingRequest.Title} {Resources.UI.Search_AlreadyRequested}"
});
@ -1374,14 +1374,11 @@ namespace PlexRequests.UI.Modules
switch (requestType)
{
case RequestType.Movie:
return Security.HasPermissions(User, Permissions.AutoApproveMovie) ||
!prSettings.RequireMovieApproval;
return Security.HasPermissions(User, Permissions.AutoApproveMovie);
case RequestType.TvShow:
return Security.HasPermissions(User, Permissions.AutoApproveTv) ||
!prSettings.RequireTvShowApproval;
return Security.HasPermissions(User, Permissions.AutoApproveTv);
case RequestType.Album:
return Security.HasPermissions(User, Permissions.AutoApproveAlbum) ||
!prSettings.RequireMusicApproval;
return Security.HasPermissions(User, Permissions.AutoApproveAlbum);
default:
return false;
}

5
PlexRequests.UI/Modules/UserWizardModule.cs
View file

@ -158,10 +158,7 @@ namespace PlexRequests.UI.Modules
currentSettings.SearchForMovies = form.SearchForMovies;
currentSettings.SearchForTvShows = form.SearchForTvShows;
currentSettings.SearchForMusic = form.SearchForMusic;
currentSettings.RequireMovieApproval = form.RequireMovieApproval;
currentSettings.RequireTvShowApproval = form.RequireTvShowApproval;
currentSettings.RequireMusicApproval = form.RequireMusicApproval;
var result = await PlexRequestSettings.SaveSettingsAsync(currentSettings);
if (result)
{