blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred
2023-08-01 18:24:44 +02:00
parent f5703a2438 f4c8f00c8f
commit 392112977c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/SearchBar.php
+3
View File
@@ -17,6 +17,9 @@ class SearchBar extends FHC_Controller
{
parent::__construct();
// Loads the AuthLib and starts the authentication
$this->load->library('AuthLib');
// Load the library SearchBarLib
$this->load->library('SearchBarLib');
}
vilesci/stammdaten/benutzerberechtigung_autocomplete.php
+6 -6
View File
@@ -36,9 +36,9 @@ if (isset($_REQUEST['autocomplete']) && $_REQUEST['autocomplete'] == 'benutzer')
$search = trim((isset($_REQUEST['term']) ? $_REQUEST['term'] : ''));
if (is_null($search) || $search == '')
exit();
$benutzer = new benutzer();
if ($benutzer->search(array(
$search
)))
@@ -61,9 +61,9 @@ if (isset($_REQUEST['autocomplete']) && $_REQUEST['autocomplete'] == 'berechtigu
$search = trim((isset($_REQUEST['term']) ? $_REQUEST['term'] : ''));
if (is_null($search) || $search == '')
exit();
$berechtigung = new berechtigung();
if ($berechtigung->searchBerechtigungen($search))
{
$result_obj = array();
@@ -107,9 +107,9 @@ if (isset($_REQUEST['autocomplete']) && $_REQUEST['autocomplete'] == 'oe_kurzbz'
}
}
usort($resultArray, function($a, $b)
uasort($resultArray, function($a, $b)
{
return $a['organisationseinheittyp_kurzbz'] <=> $b['organisationseinheittyp_kurzbz'];
return $a['organisationseinheittyp_kurzbz'].$a['bezeichnung'] <=> $b['organisationseinheittyp_kurzbz'].$b['bezeichnung'];
});
$result_obj = array();