A free open source IT asset/license management system
Added search scope and fields to presenter
snipefccd1ff0a656
diff --git a/app/Models/Asset.php b/app/Models/Asset.phpindex 2ef107007f..1a9eaf057f 100644--- a/app/Models/Asset.php+++ b/app/Models/Asset.php@@ -254,6 +254,7 @@ class Asset extends Depreciable'category' => ['name'],'manufacturer' => ['name'],'assigned_to' => ['name'],+ 'externalSource' => ['primary_mac', 'primary_ip', 'os', 'os_version'],];/**diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 2844062c5e..df99bb39f9 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -418,6 +418,60 @@ class AssetPresenter extends Presenter];}+ // Sync-adapter side-table columns. Hidden by default, exposable+ // via the column picker for admins syncing from an MDM / RMM.+ // Sort routed through Asset::scopeOrderExternalSource (leftJoin+ // on asset_external_sources) and search routed through the+ // externalSource relation in $searchableRelations. last_seen+ // sortable but not searchable (datetime substring match is+ // nonsensical for the top search bar).+ $layout[] = [+ 'field' => 'primary_mac',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('admin/settings/general.sync_adapter_field_mac'),+ 'visible' => false,+ ];+ $layout[] = [+ 'field' => 'primary_ip',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('admin/settings/general.sync_adapter_field_ip'),+ 'visible' => false,+ ];+ $layout[] = [+ 'field' => 'external_os',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('admin/settings/general.sync_adapter_field_os'),+ 'visible' => false,+ ];+ $layout[] = [+ 'field' => 'external_os_version',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('admin/settings/general.sync_adapter_field_os_version'),+ 'visible' => false,+ ];+ $layout[] = [+ 'field' => 'last_seen',+ 'scope' => 'col',+ 'searchable' => false,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('admin/settings/general.sync_adapter_field_last_seen'),+ 'visible' => false,+ 'formatter' => 'dateDisplayFormatter',+ ];+$layout[] = ['field' => 'checkincheckout','scope' => 'col',