Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-14 05:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixup website content deletion permissions

Browse source
This commit is contained in:
Slendy 2022-12-19 17:32:37 -06:00
parent f4cad21061
commit 1b69f6a0e0
No known key found for this signature in database
GPG key ID: 7288D68361B91428
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationRemovalController.cs
View file

@ -42,9 +42,7 @@ public class ModerationRemovalController : ControllerBase
Score? score = await this.database.Scores.Include(s => s.Slot).FirstOrDefaultAsync(s => s.ScoreId == id); Score? score = await this.database.Scores.Include(s => s.Slot).FirstOrDefaultAsync(s => s.ScoreId == id);
if (score == null) return null; if (score == null) return null;
if (!user.IsModerator && score.Slot.CreatorId != user.UserId) return null; return user.IsModerator ? score : null;
return score;
}); });
} }
@ -113,7 +111,7 @@ public class ModerationRemovalController : ControllerBase
Photo? photo = await this.database.Photos.Include(p => p.Slot).FirstOrDefaultAsync(p => p.PhotoId == id); Photo? photo = await this.database.Photos.Include(p => p.Slot).FirstOrDefaultAsync(p => p.PhotoId == id);
if (photo == null) return null; if (photo == null) return null;
if (!user.IsModerator && photo.Slot?.CreatorId != user.UserId) return null; if (!user.IsModerator && photo.CreatorId != user.UserId) return null;
return photo; return photo;
}); });

4
ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml
View file

@ -122,7 +122,7 @@
@foreach (Photo photo in Model.Photos) @foreach (Photo photo in Model.Photos)
{ {
string width = isMobile ? "sixteen" : "eight"; string width = isMobile ? "sixteen" : "eight";
bool canDelete = Model.User != null && (Model.User.IsModerator || Model.User.UserId == photo.CreatorId || Model.User.UserId == Model.Slot?.SlotId); bool canDelete = Model.User != null && (Model.User.IsModerator || Model.User.UserId == photo.CreatorId);
<div class="@width wide column"> <div class="@width wide column">
@await photo.ToHtml(Html, ViewData, language, timeZone, canDelete) @await photo.ToHtml(Html, ViewData, language, timeZone, canDelete)
</div> </div>
@ -147,7 +147,7 @@
"isMobile", isMobile "isMobile", isMobile
}, },
{ {
"CanDelete", (Model.User?.IsModerator ?? false) || Model.Slot?.CreatorId == Model.User?.UserId "CanDelete", Model.User?.IsModerator ?? false
}, },
}) })
</div> </div>