Fixed #2402 - add ability to restore manufacturers

2018-03-03 18:46:19 -08:00
parent fabc9e5d1c
commit f7784b6543
8 changed files with 57 additions and 5 deletions
@@ -25,14 +25,20 @@ class ManufacturersController extends Controller
        $allowed_columns = ['id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count'];

        $manufacturers = Manufacturer::select(
-            array('id','name','url','support_url','support_email','support_phone','created_at','updated_at','image')
+            array('id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'deleted_at')
        )->withCount('assets')->withCount('licenses')->withCount('consumables')->withCount('accessories');

+        if ($request->input('deleted')=='true') {
+            $manufacturers->onlyTrashed();
+        }

        if ($request->has('search')) {
            $manufacturers = $manufacturers->TextSearch($request->input('search'));
        }

+
+
+
        $offset = request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';