From 3287dd3b30f9b4fa6aca3b3e36e1c33941266f73 Mon Sep 17 00:00:00 2001 From: Alex Cabal Date: Thu, 18 Jan 2024 16:36:55 -0600 Subject: [PATCH] Show artwork IDs to admins --- www/artworks/get.php | 15 ++++++++------- www/artworks/index.php | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/www/artworks/get.php b/www/artworks/get.php index bed50f80..efbb8eea 100644 --- a/www/artworks/get.php +++ b/www/artworks/get.php @@ -8,13 +8,14 @@ $exception = $_SESSION['exception'] ?? null; try{ $artwork = Artwork::GetByUrl(HttpInput::Str(GET, 'artist-url-name'), HttpInput::Str(GET, 'artwork-url-name')); - $isAdminView = $GLOBALS['User']->Benefits->CanReviewArtwork ?? false; + $isReviewerView = $GLOBALS['User']->Benefits->CanReviewArtwork ?? false; + $isAdminView = $GLOBALS['User']->Benefits->CanReviewOwnArtwork ?? false; // If the artwork is not approved, and we're not an admin or the submitter when they can edit, don't show it. if( ($GLOBALS['User'] === null && $artwork->Status != ArtworkStatus::Approved) || - ($GLOBALS['User'] !== null && $artwork->SubmitterUserId != $GLOBALS['User']->UserId && !$isAdminView) + ($GLOBALS['User'] !== null && $artwork->SubmitterUserId != $GLOBALS['User']->UserId && !$isReviewerView) ){ throw new Exceptions\InvalidPermissionsException(); } @@ -69,12 +70,12 @@ catch(Exceptions\InvalidPermissionsException){ - + @@ -93,15 +94,15 @@ catch(Exceptions\InvalidPermissionsException){ - + - + Reviewer !== null){ ?> - + diff --git a/www/artworks/index.php b/www/artworks/index.php index 6dde0d13..cf1f865c 100644 --- a/www/artworks/index.php +++ b/www/artworks/index.php @@ -10,9 +10,9 @@ $totalArtworkCount = 0; $pageDescription = ''; $pageTitle = ''; $queryString = ''; -$isAdminView = $GLOBALS['User']?->Benefits?->CanReviewArtwork ?? false; +$isReviewerView = $GLOBALS['User']?->Benefits?->CanReviewArtwork ?? false; $submitterUserId = $GLOBALS['User']?->Benefits?->CanUploadArtwork ? $GLOBALS['User']->UserId : null; -$isSubmitterView = !$isAdminView && $submitterUserId !== null; +$isSubmitterView = !$isReviewerView && $submitterUserId !== null; if($page <= 0){ $page = 1; @@ -32,7 +32,7 @@ if($sort == 'created-newest'){ $sort = null; } -if($isAdminView){ +if($isReviewerView){ if($status == 'all' || $status === null){ $filterArtworkStatus = 'all-admin'; } @@ -47,12 +47,12 @@ if($isSubmitterView){ } } -if(!$isAdminView && !$isSubmitterView && !in_array($status, array('all', ArtworkStatus::Approved->value, 'in-use'))){ +if(!$isReviewerView && !$isSubmitterView && !in_array($status, array('all', ArtworkStatus::Approved->value, 'in-use'))){ $status = ArtworkStatus::Approved->value; $filterArtworkStatus = $status; } -if($isAdminView && !in_array($status, array('all', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use')) +if($isReviewerView && !in_array($status, array('all', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use')) && !in_array($filterArtworkStatus, array('all-admin', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use'))){ $status = ArtworkStatus::Approved->value; $filterArtworkStatus = $status; @@ -103,8 +103,8 @@ if($perPage !== ARTWORK_PER_PAGE){
TitleName) ?>Name) ?> (#ArtworkId ?>)
Artist - Artist->Name) ?>Artist->AlternateNames) > 0){ ?> (A.K.A. , ', array_map('Formatter::EscapeHtml', $artwork->Artist->AlternateNames)) ?>)Artist->DeathYear !== null){ ?> (d. Artist->DeathYear ?>) + Artist->Name) ?>Artist->AlternateNames) > 0){ ?> (A.K.A. , ', array_map('Formatter::EscapeHtml', $artwork->Artist->AlternateNames)) ?>)Artist->DeathYear !== null){ ?> (d. Artist->DeathYear ?>) (#Artist->ArtistId ?>)
Status $artwork]) ?>
Submitted bySubmitter === null){ ?>AnonymousSubmitter->Name !== null){ ?> Submitter->Name) ?>Submitter->Email) ?>Submitter === null){ ?>AnonymousSubmitter->Name !== null){ ?> Submitter->Name) ?>Submitter->Email) ?>Submitter !== null){ ?> (#Submitter->UserId ?>)
Reviewed byReviewer->Name !== null){ ?> Reviewer->Name) ?>Reviewer->Email) ?>Reviewer->Name !== null){ ?> Reviewer->Name) ?>Reviewer->Email) ?> (#Reviewer->UserId ?>)