DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133)

Browse source 
* Fixes the validation rules on Manufacturer Model

* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
This commit is contained in:
Ivan Nieto 2021-02-16 14:52:55 -06:00 committed by GitHub
parent 681c41bd18
commit f89d789832
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ManufacturersController.php
View file

@ -158,7 +158,7 @@ class ManufacturersController extends Controller
public function destroy($manufacturerId) public function destroy($manufacturerId)
{ {
$this->authorize('delete', Manufacturer::class); $this->authorize('delete', Manufacturer::class);
if (is_null($manufacturer = Manufacturer::withCount('models as models_count')->find($manufacturerId))) { if (is_null($manufacturer = Manufacturer::withTrashed()->withCount('models as models_count')->find($manufacturerId))) {
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found')); return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.not_found'));
} }
@ -174,8 +174,12 @@ class ManufacturersController extends Controller
} }
} }
// Delete the manufacturer // Soft delete the manufacturer if active, permanent delete if is already deleted
$manufacturer->delete(); if($manufacturer->deleted_at === NULL) {
$manufacturer->delete();
} else {
$manufacturer->forceDelete();
}
// Redirect to the manufacturers management page // Redirect to the manufacturers management page
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success')); return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success'));
} }

2
app/Models/Manufacturer.php
View file

@ -17,7 +17,7 @@ class Manufacturer extends SnipeModel
// Declare the rules for the form validation // Declare the rules for the form validation
protected $rules = array( protected $rules = array(
'name' => 'required|min:2|max:255|unique:manufacturers,name,NULL,deleted_at', 'name' => 'required|min:2|max:255|unique:manufacturers,name,NULL,id,deleted_at,NULL',
'url' => 'url|nullable', 'url' => 'url|nullable',
'support_url' => 'url|nullable', 'support_url' => 'url|nullable',
'support_email' => 'email|nullable' 'support_email' => 'email|nullable'