injectlib/WeddingShare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for review process

Browse Source
This commit is contained in:
Cirx08
2025-10-30 22:21:03 +00:00
parent dbfb7a85a4
commit b51d8a4513
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WeddingShare/Controllers/GalleryController.cs
View File

@@ -347,7 +347,7 @@ namespace WeddingShare.Controllers
if (files != null && files.Count > 0) if (files != null && files.Count > 0)
{ {
var galleryOwner = await _database.GetUser(gallery.Owner); var galleryOwner = await _database.GetUser(gallery.Owner);
var isFreeGallery = gallery.Owner > 0 && (galleryOwner?.Level ?? UserLevel.Free) != UserLevel.Free; var isFreeGallery = gallery.Owner > 0 && (galleryOwner?.Level ?? UserLevel.Free) == UserLevel.Free;
var requiresReview = !isFreeGallery && await _settings.GetOrDefault(Settings.Gallery.RequireReview, true, gallery.Id); var requiresReview = !isFreeGallery && await _settings.GetOrDefault(Settings.Gallery.RequireReview, true, gallery.Id);
var uploaded = 0; var uploaded = 0;
@@ -483,8 +483,9 @@ namespace WeddingShare.Controllers
var uploadedBy = HttpContext.Session.GetString(SessionKey.ViewerIdentity) ?? "Anonymous"; var uploadedBy = HttpContext.Session.GetString(SessionKey.ViewerIdentity) ?? "Anonymous";
var galleryUser = await _database.GetUser(gallery.Owner); var galleryOwner = await _database.GetUser(gallery.Owner);
var requiresReview = galleryUser != null && galleryUser.Level != UserLevel.Free && await _settings.GetOrDefault(Settings.Gallery.RequireReview, true, galleryId); var isFreeGallery = gallery.Owner > 0 && (galleryOwner?.Level ?? UserLevel.Free) == UserLevel.Free;
var requiresReview = !isFreeGallery && await _settings.GetOrDefault(Settings.Gallery.RequireReview, true, gallery.Id);
int uploaded = int.Parse((Request?.Form?.FirstOrDefault(x => string.Equals("Count", x.Key, StringComparison.OrdinalIgnoreCase)).Value)?.ToString() ?? "0"); int uploaded = int.Parse((Request?.Form?.FirstOrDefault(x => string.Equals("Count", x.Key, StringComparison.OrdinalIgnoreCase)).Value)?.ToString() ?? "0");
if (uploaded > 0 && requiresReview && await _settings.GetOrDefault(Notifications.Alerts.PendingReview, true)) if (uploaded > 0 && requiresReview && await _settings.GetOrDefault(Notifications.Alerts.PendingReview, true))

2
WeddingShare/Extensions/UserClaimsExtentions.cs
View File

@@ -92,10 +92,10 @@ namespace WeddingShare.Extensions
switch (identity.GetUserLevel()) switch (identity.GetUserLevel())
{ {
case UserLevel.Free: case UserLevel.Free:
case UserLevel.Reviewer:
return 0; return 0;
case UserLevel.Paid: case UserLevel.Paid:
return 3; return 3;
case UserLevel.Reviewer:
case UserLevel.Moderator: case UserLevel.Moderator:
case UserLevel.Admin: case UserLevel.Admin:
return 10; return 10;

2
WeddingShare/appsettings.json
View File

@@ -160,7 +160,7 @@
} }
}, },
"Release": { "Release": {
"Version": "1.8.1.0" "Version": "1.8.1.1"
}, },
"Sponsors": { "Sponsors": {
"Url": "https://sponsors.wedding-share.org", "Url": "https://sponsors.wedding-share.org",