starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-28 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in admin

Browse Source
This commit is contained in:
DariusIII
2026-06-15 12:31:39 +02:00
parent d9c4cf2d7e
commit ca76cebbaf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/AdminUserController.php
+4 -3
View File
@@ -367,16 +367,17 @@ class AdminUserController extends BasePageController
*/
private function bulkActionUsersQuery(array $userIds): Builder
{
$adminRoleName = 'Admin';
$adminRoleIds = Role::query()
->where('name', UserRole::ADMIN->label())
->where('name', $adminRoleName)
->pluck('id')
->all();
return User::query()
->whereIn('id', $userIds)
->when($adminRoleIds !== [], fn (Builder $query): Builder => $query->whereNotIn('roles_id', $adminRoleIds))
->whereDoesntHave('role', fn (Builder $query): Builder => $query->where('name', UserRole::ADMIN->label()))
->whereDoesntHave('roles', fn (Builder $query): Builder => $query->where('name', UserRole::ADMIN->label()));
->whereDoesntHave('role', fn (Builder $query): Builder => $query->where('name', $adminRoleName))
->whereDoesntHave('roles', fn (Builder $query): Builder => $query->where('name', $adminRoleName));
}
public function destroy(Request $request): RedirectResponse
tests/Feature/Admin/AdminUserControllerTest.php
+2 -2
View File
@@ -150,8 +150,6 @@ class AdminUserControllerTest extends TestCase
public function test_admin_can_bulk_resend_verification_email_to_not_verified_users(): void
{
Notification::fake();
$admin = $this->createUserWithRole('Admin', false);
$unverifiedUser = $this->createUserWithRole('User', true);
$alreadyVerifiedUser = $this->createUserWithRole('User', true);
@@ -161,6 +159,8 @@ class AdminUserControllerTest extends TestCase
'email_verified_at' => null,
])->save();
Notification::fake();
$response = $this->actingAs($admin)->post(route('admin.user-list.bulk'), [
'action' => 'resend_verification',
'user_ids' => [$unverifiedUser->id, $alreadyVerifiedUser->id],