Skip to content

A free open source IT asset/license management system

Added adapters to settings index filter box

snipeb598d552d77d
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 2b7ba49700..f02d01ab84 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -72,7 +72,10 @@ class SettingsController extends Controller
));
}
- return view('settings/index', compact('settings', 'impersonators', 'missingImpersonationUsernames'));
+ // Grab the adapters list so we can populate the hidden keywords for the settings search box
+ $adapterKeywords = implode(' ', \App\SyncAdapters\SyncAdapter::typeLabels());
+
+ return view('settings/index', compact('settings', 'impersonators', 'missingImpersonationUsernames', 'adapterKeywords'));
}
/**
@@ -680,7 +683,7 @@ class SettingsController extends Controller
if (!$wasLabel2Enabled && $request->boolean('label2_enable')) {
$setting->label2_title = $setting->qr_text;
}
-
+
if ($setting->save()) {
return redirect()->route('settings.labels.index')
@@ -1308,6 +1311,14 @@ class SettingsController extends Controller
return trans('admin/settings/sync_adapters.sync_failed_network');
}
+ // Vendor-shaped adapter errors (wrong base URL, unexpected
+ // content type, etc.) carry their own actionable message. Pass
+ // it through so the admin sees "check your Base URL" instead
+ // of "SyncAdapterVendorException".
+ if ($e instanceof \App\Exceptions\SyncAdapterVendorException) {
+ return $e->getMessage();
+ }
+
return class_basename($e);
}
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 71f40beb54..a2d25319da 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -243,6 +243,7 @@
<i class="fa-solid fa-network-wired fa-4x" aria-hidden="true"></i>
<br><br>
<span class="name">{{ trans('admin/settings/sync_adapters.title') }} <span class="label label-warning">beta</span></span>
+ <span class="keywords" aria-hidden="true" style="display:none"> {{ $adapterKeywords }}</span>
</a>
</h5>
<p class="index-block">{{ trans('admin/settings/sync_adapters.help') }}</p>