Merge pull request #16105 from snipe/use_url_fragment_for_file_uploads

snipe · web-flow · commit 8db8d4bebaaf · 2025-01-21T18:10:10.000Z
diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -51,7 +51,7 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec
                 }
 
 
-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -90,8 +90,7 @@ public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
 
             $log->delete();
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         // Redirect to the licence management page
diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php
@@ -44,10 +44,10 @@ public function store(UploadFileRequest $request, $modelId = null) : RedirectRes
                 $model->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('general.file_upload_success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
         }
 
-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
     }
 
     /**
@@ -119,11 +119,10 @@ public function destroy($modelId = null, $fileId = null) : RedirectResponse
                 }
                 $log->delete();
 
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         // Redirect to the hardware management page
diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -45,7 +45,7 @@ public function store(UploadFileRequest $request, $assetId = null) : RedirectRes
                 $asset->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
         }
 
         return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -97,25 +97,19 @@ public function show($assetId = null, $fileId = null) : View | RedirectResponse
      */
     public function destroy($assetId = null, $fileId = null) : RedirectResponse
     {
-        $asset = Asset::find($assetId);
-        $this->authorize('update', $asset);
-        $rel_path = 'private_uploads/assets';
-
-        // the asset is valid
-        if (isset($asset->id)) {
+        if ($asset = Asset::find($assetId))  {
             $this->authorize('update', $asset);
-            $log = Actionlog::find($fileId);
-            if ($log) {
+            $rel_path = 'private_uploads/assets';
+
+            if ($log = Actionlog::find($fileId)) {
                 if (Storage::exists($rel_path.'/'.$log->filename)) {
                     Storage::delete($rel_path.'/'.$log->filename);
                 }
                 $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
         }
 
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
diff --git a/app/Http/Controllers/Components/ComponentsFilesController.php b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -50,7 +50,7 @@ public function store(UploadFileRequest $request, $componentId = null)
                 }
 
 
-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -91,7 +91,7 @@ public function destroy($componentId = null, $fileId = null)
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -48,7 +48,7 @@ public function store(UploadFileRequest $request, $consumableId = null)
                 }
 
 
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -89,7 +89,7 @@ public function destroy($consumableId = null, $fileId = null)
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php
@@ -56,7 +56,7 @@ public function store(UploadFileRequest $request, $userId = null)
                 $logActions[] = $logAction;
             }
             // dd($logActions);
-            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
         }
         return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
 
@@ -87,7 +87,7 @@ public function destroy($userId = null, $fileId = null)
                 
                 if (Storage::exists($rel_path.'/'.$filename)) {
                     Storage::delete($rel_path.'/'.$filename);
-                    return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
                 }
 
             }
diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.php
@@ -46,8 +46,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string
         $extension = $file->getClientOriginalExtension();
         $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();
 
-
-        Log::debug("Your filetype IS: ".$file->getMimeType());
         // Check for SVG and sanitize it
         if ($file->getMimeType() === 'image/svg+xml') {
             Log::debug('This is an SVG');
@@ -66,7 +64,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string
 
         } else {
             $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
-            Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
         }
         return $file_name;
     }
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
@@ -49,7 +49,7 @@
                 </li>
 
                 <li>
-                    <a href="#uploads" data-toggle="tab">
+                    <a href="#files" data-toggle="tab">
 
                         <span class="hidden-lg hidden-md">
                           <i class="fas fa-barcode fa-2x"></i>
@@ -102,7 +102,7 @@ class="table table-striped snipe-table"
                 </div> <!-- /.tab-pane assets -->
 
 
-                <div class="tab-pane fade" id="uploads">
+                <div class="tab-pane fade" id="files">
 
                     <div class="row">
                         <div class="col-md-12">

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec`
`51`	`51`	`}`
`52`	`52`
`53`	`53`
`54`		`- return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));`
	`54`	`+ return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));`
`55`	`55`
`56`	`56`	`}`
`57`	`57`
`@@ -90,8 +90,7 @@ public function destroy($accessoryId = null, $fileId = null) : RedirectResponse`
`90`	`90`
`91`	`91`	`$log->delete();`
`92`	`92`
`93`		`- return redirect()->back()`
`94`		`- ->with('success', trans('admin/hardware/message.deletefile.success'));`
	`93`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`// Redirect to the licence management page`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ public function store(UploadFileRequest $request, $modelId = null) : RedirectRes`
`44`	`44`	`$model->logUpload($file_name, $request->get('notes'));`
`45`	`45`	`}`
`46`	`46`
`47`		`- return redirect()->back()->with('success', trans('general.file_upload_success'));`
	`47`	`+ return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));`
`48`	`48`	`}`
`49`	`49`
`50`		`- return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));`
	`50`	`+ return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -119,11 +119,10 @@ public function destroy($modelId = null, $fileId = null) : RedirectResponse`
`119`	`119`	`}`
`120`	`120`	`$log->delete();`
`121`	`121`
`122`		`- return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));`
	`122`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));`
`123`	`123`	`}`
`124`	`124`
`125`		`- return redirect()->back()`
`126`		`- ->with('success', trans('admin/hardware/message.deletefile.success'));`
	`125`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));`
`127`	`126`	`}`
`128`	`127`
`129`	`128`	`// Redirect to the hardware management page`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function store(UploadFileRequest $request, $componentId = null)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
`53`		`- return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));`
	`53`	`+ return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));`
`54`	`54`
`55`	`55`	`}`
`56`	`56`
`@@ -91,7 +91,7 @@ public function destroy($componentId = null, $fileId = null)`
`91`	`91`
`92`	`92`	`$log->delete();`
`93`	`93`
`94`		`- return redirect()->back()`
	`94`	`+ return redirect()->back()->withFragment('files')`
`95`	`95`	`->with('success', trans('admin/hardware/message.deletefile.success'));`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function store(UploadFileRequest $request, $consumableId = null)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`
`51`		`- return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));`
	`51`	`+ return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));`
`52`	`52`
`53`	`53`	`}`
`54`	`54`
`@@ -89,7 +89,7 @@ public function destroy($consumableId = null, $fileId = null)`
`89`	`89`
`90`	`90`	`$log->delete();`
`91`	`91`
`92`		`- return redirect()->back()`
	`92`	`+ return redirect()->back()->withFragment('files')`
`93`	`93`	`->with('success', trans('admin/hardware/message.deletefile.success'));`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function store(UploadFileRequest $request, $userId = null)`
`56`	`56`	`$logActions[] = $logAction;`
`57`	`57`	`}`
`58`	`58`	`// dd($logActions);`
`59`		`- return redirect()->back()->with('success', trans('admin/users/message.upload.success'));`
	`59`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));`
`60`	`60`	`}`
`61`	`61`	`return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));`
`62`	`62`
`@@ -87,7 +87,7 @@ public function destroy($userId = null, $fileId = null)`
`87`	`87`
`88`	`88`	`if (Storage::exists($rel_path.'/'.$filename)) {`
`89`	`89`	`Storage::delete($rel_path.'/'.$filename);`
`90`		`- return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));`
	`90`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string`
`46`	`46`	`$extension = $file->getClientOriginalExtension();`
`47`	`47`	`$file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();`
`48`	`48`
`49`		`-`
`50`		`- Log::debug("Your filetype IS: ".$file->getMimeType());`
`51`	`49`	`// Check for SVG and sanitize it`
`52`	`50`	`if ($file->getMimeType() === 'image/svg+xml') {`
`53`	`51`	`Log::debug('This is an SVG');`
`@@ -66,7 +64,6 @@ public function handleFile(string $dirname, string $name_prefix, $file): string`
`66`	`64`
`67`	`65`	`} else {`
`68`	`66`	`$put_results = Storage::put($dirname.$file_name, file_get_contents($file));`
`69`		`- Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");`
`70`	`67`	`}`
`71`	`68`	`return $file_name;`
`72`	`69`	`}`