More ajax menu fixes

This commit is contained in:
snipe
2017-10-28 11:17:52 -07:00
parent 9c94e70917
commit 39c68214e9
26 changed files with 119 additions and 257 deletions
@@ -139,7 +139,7 @@ class CategoriesController extends Controller
* @see \App\Http\Transformers\SelectlistTransformer
*
*/
public function selectlist(Request $request)
public function selectlist(Request $request, $category_type = 'asset')
{
$this->authorize('view', Categories::class);
@@ -153,7 +153,7 @@ class CategoriesController extends Controller
$categories = $categories->where('name', 'LIKE', '%'.$request->get('search').'%');
}
$categories = $categories->orderBy('name', 'ASC')->paginate(50);
$categories = $categories->where('category_type', $category_type)->orderBy('name', 'ASC')->paginate(50);
// Loop through and set some custom properties for the transformer to use.
// This lets us have more flexibility in special cases like assets, where
+3 -4
View File
@@ -138,16 +138,15 @@ class UsersController extends Controller
$users = Company::scopeCompanyables($users);
if ($request->has('search')) {
$users = $users->where('first_name', '=', '%'.$request->get('search').'%')
$users = $users->where('first_name', 'LIKE', '%'.$request->get('search').'%')
->orWhere('last_name', 'LIKE', '%'.$request->get('search').'%')
->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
->orWhere('employee_num', '=', '%'.$request->get('search').'%');
->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
}
$users = $users->orderBy('last_name', 'asc');
$users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
$users = $users->paginate(50);
foreach ($users as $user) {
$name_str = '';
if ($user->last_name!='') {