diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index f195df92dc20..8661b625c580 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -1402,6 +1402,7 @@ public function getLabels(Request $request): JsonResponse // bulkedit=false and count=0 are default values for label generation $label = $label->with('assets', $assets) ->with('settings', $settings) + ->with('offset', max(0, (int) $request->input('offset', 0))) ->with('bulkedit', false) ->with('count', 0); diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index b6807bcc30bb..b2399bf6fc3d 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -178,9 +178,12 @@ public function edit(Request $request): View|RedirectResponse case 'labels': $this->authorize('view', Asset::class); + $offset = max(0, (int) $request->input('offset', 0)); + return (new Label) ->with('assets', $assets) ->with('settings', Setting::getSettings()) + ->with('offset', $offset) ->with('bulkedit', true) ->with('count', 0); diff --git a/resources/views/blade/table/bulk-assets.blade.php b/resources/views/blade/table/bulk-assets.blade.php index ce83614e8c29..46fdc88e49f0 100644 --- a/resources/views/blade/table/bulk-assets.blade.php +++ b/resources/views/blade/table/bulk-assets.blade.php @@ -44,6 +44,22 @@ class="form-inline" @endif + + + diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index 0d675d3beb78..996a00ad02f5 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -12,6 +12,9 @@ $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; // Leave space on bottom for 1D barcode if necessary $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->label2_1d_type!='') ? $settings->labels_height - .3 : $settings->labels_height - 0.1; +$offset = max(0, (int) ($offset ?? 0)); +$count = (int) ($count ?? 0); +$total_labels = count($assets) + $offset; ?> +@for ($i = 0; $i < $offset; $i++) + +
+ + @if (($count % $settings->labels_per_page == 0) && $count!=$total_labels) + + + @endif +@endfor + @foreach ($assets as $asset)