Public/pics
2
2
Fork 2
Code Issues 6 Pull Requests 2 Releases Wiki Activity

Allow users to filter albums by contributors #48

Merged
Roflin merged 18 commits from refactor/viewalbum into master 2024-01-20 20:11:18 +01:00
Conversation 1 Commits 18 Files Changed 11 +24 -15
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c00248a7f - Show all commits

6
controllers/ViewPhotoAlbum.php
View File

@ -47,7 +47,10 @@ class ViewPhotoAlbum extends HTMLController
$contributors = $tag->getContributorList(); $contributors = $tag->getContributorList();
// Enumerate possible filters // Enumerate possible filters
$filters = ['' => ['id_user' => null, 'caption' => 'Show all photos', 'link' => $tag->getUrl()]]; $filters = [];
if (!empty($contributors))
{
$filters[''] = ['id_user' => null, 'caption' => 'Show all photos', 'link' => $tag->getUrl()];
Aaron marked this conversation as resolved Outdated
minnozz commented 2024-01-15 09:55:32 +01:00
Outdated
Review
Copy Link

Key label missing

Key `label` missing
Aaron commented 2024-01-15 11:27:23 +01:00
Outdated
Review
Copy Link

I initially didn't add it as it'd never be used. You're right, though, and it's better to just have it there for consistency.

I initially didn't add it as it'd never be used. You're right, though, and it's better to just have it there for consistency.
foreach ($contributors as $contributor) foreach ($contributors as $contributor)
{ {
$filters[$contributor['slug']] = [ $filters[$contributor['slug']] = [
@ -57,6 +60,7 @@ class ViewPhotoAlbum extends HTMLController
'link' => $tag->getUrl() . '/?by=' . $contributor['slug'], 'link' => $tag->getUrl() . '/?by=' . $contributor['slug'],
]; ];
} }
}
// Limit to a particular uploader? // Limit to a particular uploader?
$active_filter = ''; $active_filter = '';

7
templates/AlbumButtonBox.php
View File

@ -28,6 +28,8 @@ class AlbumButtonBox extends Template
echo ' echo '
<a class="btn btn-light" href="', $button['url'], '">', $button['caption'], '</a>'; <a class="btn btn-light" href="', $button['url'], '">', $button['caption'], '</a>';
if (!empty($this->filters))
{
echo ' echo '
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false"> <button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
@ -47,7 +49,10 @@ class AlbumButtonBox extends Template
echo ' echo '
</ul> </ul>
</div> </div>';
}
echo '
</div>'; </div>';
} }
} }