svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds company-scoped dropdown for parent location

Browse Source
This commit is contained in:
snipe
2026-06-13 18:38:06 +01:00
parent 45d6a491cb
commit cc526d9b42
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/LocationsController.php
+4
View File
@@ -484,6 +484,10 @@ class LocationsController extends Controller
$locations->where('locations.id', '!=', (int) $request->input('excludeId'));
}
if ((Setting::getSettings()->full_multiple_companies_support == '1') && $request->filled('companyId')) {
$locations->where('locations.company_id', '=', (int) $request->input('companyId'));
}
$locations = $locations->orderBy('name', 'ASC')->get();
$locations_with_children = [];
resources/views/locations/edit.blade.php
+14 -1
View File
@@ -1,3 +1,16 @@
@push('js')
<script nonce="{{ csrf_token() }}">
$(function () {
$('[name="company_id"]').on('select2:select select2:clear', function (e) {
var companyId = $(this).val() || null;
var $parentSelect = $('#parent_id_location_select');
$parentSelect.data('company-id', companyId);
$parentSelect.val(null).trigger('change');
});
});
</script>
@endpush
@extends('layouts/edit-form', [
'createText' => trans('admin/locations/table.create') ,
'updateText' => trans('admin/locations/table.update'),
@@ -10,7 +23,7 @@
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/locations/table.name')])
<!-- parent -->
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/locations/table.parent'), 'fieldname' => 'parent_id', 'exclude_id' => isset($item) ? $item->id : null])
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/locations/table.parent'), 'fieldname' => 'parent_id', 'exclude_id' => isset($item) ? $item->id : null, 'company_id' => isset($item) ? $item->company_id : null])
<!-- Manager-->
@include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])