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

Андрей Ларионов
2 parents a87b39d4c1 d467eae70b
Showing 2 changed files Side-by-side Diff
app/Http/Controllers/EmployerController.php
app/Http/Controllers/WorkerController.php
@@ -618,7 +618,7 @@ class EmployerController extends Controller
  
         // Данные
         $users = $users->Baseuser()->
-                        orderBy(Worker::select('position_work')->whereColumn('Workers.user_id', 'users.id'));
+                        orderBy(Worker::select('position_work')->whereColumn('workers.user_id', 'users.id'));
         $count_users = $users;
         $users = $users->paginate(5);
  
@@ -111,12 +111,12 @@ class WorkerController extends Controller
                 switch ($sort) {
                     case 'name_up':
                         $resumes = $resumes->orderBy(User::select('surname')
-                            ->whereColumn('Workers.user_id', 'users.id')
+                            ->whereColumn('workers.user_id', 'users.id')
                         );
                         break;
                     case 'name_down':
                         $resumes = $resumes->orderByDesc(User::select('surname')
-                            ->whereColumn('Workers.user_id', 'users.id')
+                            ->whereColumn('workers.user_id', 'users.id')
                         );
                         break;
                     case 'created_at_up':
...	...	@@ -618,7 +618,7 @@ class EmployerController extends Controller
618	618
619	619	// Данные
620	620	$users = $users->Baseuser()->
621		- orderBy(Worker::select('position_work')->whereColumn('Workers.user_id', 'users.id'));
	621	+ orderBy(Worker::select('position_work')->whereColumn('workers.user_id', 'users.id'));
622	622	$count_users = $users;
623	623	$users = $users->paginate(5);
624	624
...	...	@@ -111,12 +111,12 @@ class WorkerController extends Controller
111	111	switch ($sort) {
112	112	case 'name_up':
113	113	$resumes = $resumes->orderBy(User::select('surname')
114		- ->whereColumn('Workers.user_id', 'users.id')
	114	+ ->whereColumn('workers.user_id', 'users.id')
115	115	);
116	116	break;
117	117	case 'name_down':
118	118	$resumes = $resumes->orderByDesc(User::select('surname')
119		- ->whereColumn('Workers.user_id', 'users.id')
	119	+ ->whereColumn('workers.user_id', 'users.id')
120	120	);
121	121	break;
122	122	case 'created_at_up':