mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Added notes to API controllers
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
aa14cfe18d
commit
4ee5a4c5c3
|
@ -39,6 +39,7 @@ class CategoriesController extends Controller
|
||||||
'components_count',
|
'components_count',
|
||||||
'licenses_count',
|
'licenses_count',
|
||||||
'image',
|
'image',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
$categories = Category::select([
|
$categories = Category::select([
|
||||||
|
@ -52,6 +53,7 @@ class CategoriesController extends Controller
|
||||||
'require_acceptance',
|
'require_acceptance',
|
||||||
'checkin_email',
|
'checkin_email',
|
||||||
'image',
|
'image',
|
||||||
|
'notes',
|
||||||
])
|
])
|
||||||
->with('adminuser')
|
->with('adminuser')
|
||||||
->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
|
->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
|
||||||
|
|
|
@ -38,6 +38,7 @@ class CompaniesController extends Controller
|
||||||
'accessories_count',
|
'accessories_count',
|
||||||
'consumables_count',
|
'consumables_count',
|
||||||
'components_count',
|
'components_count',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
$companies = Company::withCount(['assets as assets_count' => function ($query) {
|
$companies = Company::withCount(['assets as assets_count' => function ($query) {
|
||||||
|
|
|
@ -23,7 +23,7 @@ class DepartmentsController extends Controller
|
||||||
public function index(Request $request) : JsonResponse | array
|
public function index(Request $request) : JsonResponse | array
|
||||||
{
|
{
|
||||||
$this->authorize('view', Department::class);
|
$this->authorize('view', Department::class);
|
||||||
$allowed_columns = ['id', 'name', 'image', 'users_count'];
|
$allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];
|
||||||
|
|
||||||
$departments = Department::select(
|
$departments = Department::select(
|
||||||
'departments.id',
|
'departments.id',
|
||||||
|
@ -35,7 +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',
|
||||||
|
'departments.notes',
|
||||||
)->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
|
)->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
|
||||||
|
|
||||||
if ($request->filled('search')) {
|
if ($request->filled('search')) {
|
||||||
|
|
|
@ -24,7 +24,7 @@ class GroupsController extends Controller
|
||||||
|
|
||||||
$this->authorize('view', Group::class);
|
$this->authorize('view', Group::class);
|
||||||
|
|
||||||
$groups = Group::select('id', 'name', 'permissions', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count');
|
$groups = Group::select('id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count');
|
||||||
|
|
||||||
if ($request->filled('search')) {
|
if ($request->filled('search')) {
|
||||||
$groups = $groups->TextSearch($request->input('search'));
|
$groups = $groups->TextSearch($request->input('search'));
|
||||||
|
@ -81,6 +81,7 @@ class GroupsController extends Controller
|
||||||
|
|
||||||
$group->name = $request->input('name');
|
$group->name = $request->input('name');
|
||||||
$group->created_by = auth()->id();
|
$group->created_by = auth()->id();
|
||||||
|
$group->notes = $request->input('notes');
|
||||||
$group->permissions = json_encode($request->input('permissions', $groupPermissions));
|
$group->permissions = json_encode($request->input('permissions', $groupPermissions));
|
||||||
|
|
||||||
if ($group->save()) {
|
if ($group->save()) {
|
||||||
|
@ -118,6 +119,7 @@ class GroupsController extends Controller
|
||||||
$group = Group::findOrFail($id);
|
$group = Group::findOrFail($id);
|
||||||
|
|
||||||
$group->name = $request->input('name');
|
$group->name = $request->input('name');
|
||||||
|
$group->notes = $request->input('notes');
|
||||||
$group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
|
$group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
|
||||||
|
|
||||||
if ($group->save()) {
|
if ($group->save()) {
|
||||||
|
|
|
@ -53,6 +53,7 @@ class LocationsController extends Controller
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'users_count',
|
'users_count',
|
||||||
'zip',
|
'zip',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
$locations = Location::with('parent', 'manager', 'children')->select([
|
$locations = Location::with('parent', 'manager', 'children')->select([
|
||||||
|
@ -73,6 +74,7 @@ class LocationsController extends Controller
|
||||||
'locations.image',
|
'locations.image',
|
||||||
'locations.ldap_ou',
|
'locations.ldap_ou',
|
||||||
'locations.currency',
|
'locations.currency',
|
||||||
|
'locations.notes',
|
||||||
])
|
])
|
||||||
->withCount('assignedAssets as assigned_assets_count')
|
->withCount('assignedAssets as assigned_assets_count')
|
||||||
->withCount('assets as assets_count')
|
->withCount('assets as assets_count')
|
||||||
|
@ -190,6 +192,7 @@ class LocationsController extends Controller
|
||||||
'locations.updated_at',
|
'locations.updated_at',
|
||||||
'locations.image',
|
'locations.image',
|
||||||
'locations.currency',
|
'locations.currency',
|
||||||
|
'locations.notes',
|
||||||
])
|
])
|
||||||
->withCount('assignedAssets as assigned_assets_count')
|
->withCount('assignedAssets as assigned_assets_count')
|
||||||
->withCount('assets as assets_count')
|
->withCount('assets as assets_count')
|
||||||
|
|
|
@ -39,7 +39,8 @@ class ManufacturersController extends Controller
|
||||||
'assets_count',
|
'assets_count',
|
||||||
'consumables_count',
|
'consumables_count',
|
||||||
'components_count',
|
'components_count',
|
||||||
'licenses_count'
|
'licenses_count',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
$manufacturers = Manufacturer::select([
|
$manufacturers = Manufacturer::select([
|
||||||
|
@ -55,6 +56,7 @@ class ManufacturersController extends Controller
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'image',
|
'image',
|
||||||
'deleted_at',
|
'deleted_at',
|
||||||
|
'notes',
|
||||||
])
|
])
|
||||||
->with('adminuser')
|
->with('adminuser')
|
||||||
->withCount('assets as assets_count')
|
->withCount('assets as assets_count')
|
||||||
|
|
Loading…
Reference in a new issue