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

Merge branch 'develop' into remove_old_ldap

Browse source
This commit is contained in:
Brady Wetherington 2021-11-09 18:33:41 -08:00
parent a58c5ce27f 98de8526db
commit 91f087258b
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.example
View file

@ -15,6 +15,10 @@ MAX_RESULTS=500
PRIVATE_FILESYSTEM_DISK=local PRIVATE_FILESYSTEM_DISK=local
PUBLIC_FILESYSTEM_DISK=local_public PUBLIC_FILESYSTEM_DISK=local_public
#PRIVATE_FILESYSTEM_DISK=s3_private
#PUBLIC_FILESYSTEM_DISK=s3_public
# -------------------------------------------- # --------------------------------------------
# REQUIRED: DATABASE SETTINGS # REQUIRED: DATABASE SETTINGS
# -------------------------------------------- # --------------------------------------------

7
app/Http/Controllers/Api/DepartmentsController.php
View file

@ -6,6 +6,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Transformers\DepartmentsTransformer; use App\Http\Transformers\DepartmentsTransformer;
use App\Http\Transformers\SelectlistTransformer; use App\Http\Transformers\SelectlistTransformer;
use App\Models\Company;
use App\Models\Department; use App\Models\Department;
use Auth; use Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -26,7 +27,7 @@ class DepartmentsController extends Controller
$this->authorize('view', Department::class); $this->authorize('view', Department::class);
$allowed_columns = ['id', 'name', 'image', 'users_count']; $allowed_columns = ['id', 'name', 'image', 'users_count'];
$departments = Department::select([ $departments = Company::scopeCompanyables(Department::select(
'departments.id', 'departments.id',
'departments.name', 'departments.name',
'departments.location_id', 'departments.location_id',
@ -34,8 +35,8 @@ class DepartmentsController extends Controller
'departments.manager_id', 'departments.manager_id',
'departments.created_at', 'departments.created_at',
'departments.updated_at', 'departments.updated_at',
'departments.image', 'departments.image'),
])->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count'); "company_id", "departments")->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
if ($request->filled('search')) { if ($request->filled('search')) {
$departments = $departments->TextSearch($request->input('search')); $departments = $departments->TextSearch($request->input('search'));

10
app/Models/Asset.php
View file

@ -1357,8 +1357,8 @@ class Asset extends Depreciable
}); });
} }
if ($fieldname == 'checkedout_to') { if ($fieldname =='assigned_to') {
$query->whereHas('assigneduser', function ($query) use ($search_val) { $query->whereHasMorph('assignedTo', [User::class], function ($query) use ($search_val) {
$query->where(function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) {
$query->where('users.first_name', 'LIKE', '%'.$search_val.'%') $query->where('users.first_name', 'LIKE', '%'.$search_val.'%')
->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%'); ->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%');
@ -1421,7 +1421,7 @@ class Asset extends Depreciable
}); });
}); });
} }
}
/** /**
* THIS CLUNKY BIT IS VERY IMPORTANT * THIS CLUNKY BIT IS VERY IMPORTANT
@ -1447,11 +1447,11 @@ class Asset extends Depreciable
*/ */
if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier') if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')
&& ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) { && ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
$query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%'); $query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
} }
}
}); });