Use bulk actions menu

snipe · Sep 23, 2024 · a2d4dcf · a2d4dcf
1 parent 54044bf
commit a2d4dcf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 36 deletions.
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
@@ -13,6 +13,7 @@
 use App\Models\LicenseSeat;
 use App\Models\ConsumableAssignment;
 use App\Models\Consumable;
+use App\Models\Setting;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -76,6 +77,30 @@ public function edit(Request $request)
                 }
                 return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));
 
+            } elseif ($request->input('bulk_actions') == 'print') {
+                $users = User::query()
+                    ->with([
+                        'assets.assetlog',
+                        'assets.assignedAssets.assetlog',
+                        'assets.assignedAssets.defaultLoc',
+                        'assets.assignedAssets.location',
+                        'assets.assignedAssets.model.category',
+                        'assets.defaultLoc',
+                        'assets.location',
+                        'assets.model.category',
+                        'accessories.category',
+                        'accessories.manufacturer',
+                        'consumables.assetlog',
+                        'consumables.category',
+                        'consumables.manufacturer',
+                        'licenses.category',
+                    ])
+                    ->withTrashed()
+                    ->findMany($request->input('ids'));
+
+                return view('users.print')
+                    ->with('users', $users)
+                    ->with('settings', Setting::getSettings());
             }
         }
 

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
@@ -619,37 +619,6 @@ public function printInventory($id)
         return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
     }
 
-    public function printAllThings()
-    {
-        $this->authorize('view', User::class);
-
-        $users = User::query()
-            ->with([
-                'assets.assetlog',
-                'assets.assignedAssets.assetlog',
-                'assets.assignedAssets.defaultLoc',
-                'assets.assignedAssets.location',
-                'assets.assignedAssets.model.category',
-                'assets.defaultLoc',
-                'assets.location',
-                'assets.model.category',
-                'accessories.category',
-                'accessories.manufacturer',
-                'consumables.assetlog',
-                'consumables.category',
-                'consumables.manufacturer',
-                'licenses.category',
-            ])
-            ->withTrashed()
-            ->get();
-
-        // @todo: more authorization
-
-        return view('users.print')
-            ->with('users', $users)
-            ->with('settings', Setting::getSettings());
-    }
-
     /**
      * Emails user a list of assigned assets
      *

diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
@@ -14,10 +14,11 @@
                 <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
                 <option value="merge">{!! trans('general.merge_users') !!}</option>
                 <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
+                <option value="print">{{ trans('admin/users/general.print_assigned') }}</option>
             </select>
             <button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
         </div>
     @endcan
 @endif
     {{ Form::close() }}
-</div>
+</div>
diff --git a/routes/web/users.php b/routes/web/users.php
@@ -105,10 +105,6 @@
         ]
     )->name('users.print');
 
-    Route::get('print-all-things', [Users\UsersController::class, 'printAllThings'])
-        ->withoutMiddleware([AssetCountForSidebar::class])
-        ->name('users.print-all-things');
-
     Route::post(
         '{userId}/email',
         [