Fix for review process
This commit is contained in:
@@ -347,7 +347,7 @@ namespace WeddingShare.Controllers
|
||||
if (files != null && files.Count > 0)
|
||||
{
|
||||
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 uploaded = 0;
|
||||
@@ -483,8 +483,9 @@ namespace WeddingShare.Controllers
|
||||
|
||||
var uploadedBy = HttpContext.Session.GetString(SessionKey.ViewerIdentity) ?? "Anonymous";
|
||||
|
||||
var galleryUser = await _database.GetUser(gallery.Owner);
|
||||
var requiresReview = galleryUser != null && galleryUser.Level != UserLevel.Free && await _settings.GetOrDefault(Settings.Gallery.RequireReview, true, galleryId);
|
||||
var galleryOwner = await _database.GetUser(gallery.Owner);
|
||||
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");
|
||||
if (uploaded > 0 && requiresReview && await _settings.GetOrDefault(Notifications.Alerts.PendingReview, true))
|
||||
|
||||
@@ -92,10 +92,10 @@ namespace WeddingShare.Extensions
|
||||
switch (identity.GetUserLevel())
|
||||
{
|
||||
case UserLevel.Free:
|
||||
case UserLevel.Reviewer:
|
||||
return 0;
|
||||
case UserLevel.Paid:
|
||||
return 3;
|
||||
case UserLevel.Reviewer:
|
||||
case UserLevel.Moderator:
|
||||
case UserLevel.Admin:
|
||||
return 10;
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
}
|
||||
},
|
||||
"Release": {
|
||||
"Version": "1.8.1.0"
|
||||
"Version": "1.8.1.1"
|
||||
},
|
||||
"Sponsors": {
|
||||
"Url": "https://sponsors.wedding-share.org",
|
||||
|
||||
Reference in New Issue
Block a user