diff options
Diffstat (limited to 'Pages')
| -rw-r--r-- | Pages/Component/AclDialog.razor | 4 | ||||
| -rw-r--r-- | Pages/Gallery.razor | 12 | ||||
| -rw-r--r-- | Pages/ViewMedia.razor | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/Pages/Component/AclDialog.razor b/Pages/Component/AclDialog.razor index c924b98..476306b 100644 --- a/Pages/Component/AclDialog.razor +++ b/Pages/Component/AclDialog.razor @@ -149,7 +149,7 @@ public bool ApplyDisabled => GetAclHashCode(obj.Acl!) == lastHashCode || - obj.Acl!.Rules.Select(r => r.Principal).Contains(WellKnownSid.NullSid); + obj.Acl!.Rules.Select(r => r.Principal).Contains(WellKnownSid.NullSid); protected override void OnAfterRender(bool firstRender) { if(subjectSelect is null || ruleToEdit is null) @@ -188,9 +188,9 @@ private void ApplyAcl() { if(obj.Acl!.Rules.Count() == 0) { - obj.Acl = null; if(!addedAcl) db.Remove(obj.Acl!); + obj.Acl = null; } db.SaveChanges(); diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor index e779e5b..948d135 100644 --- a/Pages/Gallery.razor +++ b/Pages/Gallery.razor @@ -2,6 +2,7 @@ @page "/Gallery" @inject IDbContextFactory<HBContext> dbFactory @inject ITagService tagService +@inject IFeedService feedService @inject ISearchService searchService @inject IUserService userService @inject IJSRuntime jsRuntime @@ -67,6 +68,15 @@ private Media[] queryResult; private IEnumerator<Media> mediaEnumerator; + private FeedOptions feedOptions = new() { + SortType = FeedSortType.Chronological, + SortOrder = FeedSortOrder.Descending, + RandomPosition = false, + IncludeProperties = (media) => media + .Include(m => m.Tags) + .Include(m => m.CurrentUploadedFile) + }; + protected override void OnInitialized() => userService.ShowNsfwChanged += ShowNsfwChanged; @@ -80,6 +90,8 @@ } private void LoadMedia() { + feedService.InitializeFeed(feedOptions); + using var db = dbFactory.CreateDbContext(); if(Query is not null) { diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor index 05cf700..af9a8a1 100644 --- a/Pages/ViewMedia.razor +++ b/Pages/ViewMedia.razor @@ -18,8 +18,8 @@ <div id="image-container"> <img src="/media/@(media.Guid)" - width=@media.CurrentUploadedFile.Width - height=@media.CurrentUploadedFile.Height + width=@media.CurrentUploadedFile!.Width + height=@media.CurrentUploadedFile!.Height onclick="toggleSidebar()"/> </div> <div id="metadata"> |