Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Андрей Ларионов
2 parents d50cbef749 01ae8538d8
Showing 2 changed files Side-by-side Diff
app/Http/Controllers/WorkerController.php
resources/views/employers/bd.blade.php
@@ -95,10 +95,12 @@ class WorkerController extends Controller
                 });
             }
  
-            $Job_title = Job_title::query()->
-                            where('is_remove', '=', '0')->
-                            where('is_bd', '=' , '1')->
-                            get();
+            $Job_title = Job_title::query()
+                ->where('is_remove', '=', '0')
+                ->where('is_bd', '=' , '1')
+                ->orderByDesc('sort')
+                ->get()
+            ;
  
             if ($request->get('sort')) {
                 $sort = $request->get('sort');
@@ -20,6 +20,7 @@
             $('.search-reset-button').click(function(){
                 var wrap = $(this).closest('.cabinet__filters');
                 wrap.find('[name="search"]').val('');
+                wrap.find('button').click();
             });
         });
...	...	@@ -95,10 +95,12 @@ class WorkerController extends Controller
95	95	});
96	96	}
97	97
98		- $Job_title = Job_title::query()->
99		- where('is_remove', '=', '0')->
100		- where('is_bd', '=' , '1')->
101		- get();
	98	+ $Job_title = Job_title::query()
	99	+ ->where('is_remove', '=', '0')
	100	+ ->where('is_bd', '=' , '1')
	101	+ ->orderByDesc('sort')
	102	+ ->get()
	103	+ ;
102	104
103	105	if ($request->get('sort')) {
104	106	$sort = $request->get('sort');
...	...	@@ -20,6 +20,7 @@
20	20	$('.search-reset-button').click(function(){
21	21	var wrap = $(this).closest('.cabinet__filters');
22	22	wrap.find('[name="search"]').val('');
	23	+ wrap.find('button').click();
23	24	});
24	25	});
25	26