beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #351 from Moonlight-Panel/v2_Fixes

Browse source 
Some fixes
This commit is contained in:
Marcel Baumgartner 2024-01-05 11:06:10 +01:00 committed by GitHub
commit 2edf8b4a9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Moonlight/Shared/Views/Account/Payments.razor
View file

@ -134,7 +134,7 @@
private async Task LaunchPayment()
{
if (SelectedGateway == null)
return;
throw new DisplayException("You need to select a payment method");
var url = await SelectedGateway.Start(Amount);
Navigation.NavigateTo(url, true);

11
Moonlight/Shared/Views/Service/Index.razor
View file

@ -5,6 +5,7 @@
@using Moonlight.App.Services.ServiceManage
@using Microsoft.EntityFrameworkCore
@using Moonlight.App.Models.Abstractions.Services
@using Moonlight.App.Models.Enums
@using Moonlight.App.Services
@inject Repository<Service> ServiceRepository
@ -19,7 +20,8 @@
}
else
{
if (NeedsRenewal)
// An admin should still be able to manage the service, that's why we check for permissions here
if (NeedsRenewal && !IdentityService.Permissions[Permission.AdminServices])
{
<NeedsRenewalAlert />
}
@ -50,7 +52,7 @@
private ServiceDefinition Definition;
private ServiceViewContext ViewContext;
private bool NeedsRenewal = false;
private bool NeedsRenewal;
private async Task Load(LazyLoader lazyLoader)
{
@ -73,9 +75,12 @@
if (Service == null)
return;
// Check expiration
NeedsRenewal = await ServiceService.Manage.NeedsRenewal(Service);
if(NeedsRenewal) // Stop loading more data
// Stop loading more data if the user is not an admin
// because a admin should still be able to manage the service
if(NeedsRenewal && !IdentityService.Permissions[Permission.AdminServices])
return;
// Load implementation