Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions resources/js/pages/Forum/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,10 @@ const openImageModal = (src: string, alt = 'Attached image') => {
// Toggle Answered
const isTogglingAnswered = ref(false);
const toggleAnswered = () => {
if (!user.value || user.value.id !== props.post.user_id) {
if (
!user.value ||
(user.value.id !== props.post.user_id && !can('manage forums'))
) {
return;
}

Expand Down Expand Up @@ -925,9 +928,12 @@ function parseMentions(
</span>
</button>

<!-- Owner "Mark as Answered" Toggle -->
<!-- Author or Moderator "Mark as Answered" Toggle -->
<button
v-if="user && user.id === post.user_id"
v-if="
user &&
(user.id === post.user_id || can('manage forums'))
"
type="button"
@click="toggleAnswered"
:disabled="isTogglingAnswered"
Expand Down
12 changes: 12 additions & 0 deletions tests/Feature/ForumTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@
$this->actingAs($author)->post("/forum/posts/{$post->id}/toggle-answered");
$post->refresh();
expect($post->is_answered)->toBeFalse();

// Moderator with manage forums permission can toggle
$moderator = User::factory()->create();
$moderator->givePermissionTo('manage forums');

$this->actingAs($moderator)->post("/forum/posts/{$post->id}/toggle-answered");
$post->refresh();
expect($post->is_answered)->toBeTrue();

$this->actingAs($moderator)->post("/forum/posts/{$post->id}/toggle-answered");
$post->refresh();
expect($post->is_answered)->toBeFalse();
});

test('profane words trigger CleanText validation on post and answer', function () {
Expand Down