Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit e2c3386c33ce · 2024-02-13T20:37:17.000Z
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
@@ -168,7 +168,7 @@ public function destroy($locationId)
     {
         $this->authorize('delete', Location::class);
         if (is_null($location = Location::find($locationId))) {
-            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
+            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.does_not_exist'));
         }
 
         if ($location->users()->count() > 0) {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public function destroy($locationId)`
`168`	`168`	`{`
`169`	`169`	`$this->authorize('delete', Location::class);`
`170`	`170`	`if (is_null($location = Location::find($locationId))) {`
`171`		`- return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));`
	`171`	`+ return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.does_not_exist'));`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`if ($location->users()->count() > 0) {`