Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1431 from HB9HIL/user_name_search

Browse Source
This commit is contained in:
Fabian Berg
2025-01-02 23:24:30 +01:00
committed by GitHub
parent 011b19bb89 0f55dee097
commit 37b6c0a4ae
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Club.php
View File

@@ -94,6 +94,7 @@ class Club extends CI_Controller
foreach ($users->result() as $user) {
$result[] = [
'user_id' => $user->user_id,
'user_name' => $user->user_name,
'user_callsign' => $user->user_callsign,
'user_firstname' => $user->user_firstname,
'user_lastname' => $user->user_lastname

3
application/models/User_model.php
View File

@@ -160,13 +160,14 @@ class User_Model extends CI_Model {
if (strlen($query) < 2) {
return false;
}
$this->db->select('user_id, user_callsign, user_firstname, user_lastname');
$this->db->select('user_id, user_name, user_callsign, user_firstname, user_lastname');
if (!$clubstations) {
$this->db->where('clubstation', 0);
}
$this->db->group_start();
$this->db->like('user_callsign', $query);
$this->db->or_like('user_name', $query);
$this->db->or_like('user_firstname', $query);
$this->db->or_like('user_lastname', $query);
$this->db->group_end();

8
assets/js/sections/club_permissions.js
View File

@@ -27,7 +27,7 @@ $(document).ready(function(){
closeAfterSelect: true,
valueField: 'user_id',
labelField: 'user_callsign',
searchField: ['user_callsign', 'user_firstname', 'user_lastname'],
searchField: ['user_name', 'user_callsign', 'user_firstname', 'user_lastname'],
options: [],
create: false,
load: function(query, callback) {
@@ -48,15 +48,17 @@ $(document).ready(function(){
},
render: {
option: function(item) {
let string = '<div style="text-align: left; margin-left: 10px; padding: 3px;">' + item.user_callsign.toUpperCase() + ' - ' + item.user_firstname + ' ' + item.user_lastname + '</div>';
let string = '<div style="text-align: left; margin-left: 10px; padding: 3px;"><span class="text-muted small">[' + item.user_name + ']</span> ' + item.user_callsign.toUpperCase() + ' - ' + item.user_firstname + ' ' + item.user_lastname + '</div>';
return string;
},
item: function(item) {
let string = '<div style="text-align: left; margin-left: 2px;">' + item.user_callsign.toUpperCase() + ' - ' + item.user_firstname + ' ' + item.user_lastname + '</div>';
let string = '<div style="text-align: left; margin-left: 2px;"><span class="text-muted small">[' + item.user_name + ']</span> ' + item.user_callsign.toUpperCase() + ' - ' + item.user_firstname + ' ' + item.user_lastname + '</div>';
return string;
}
},
onInitialize: function() {
this.$control.addClass('selectize-dark');
$('.selectize-control').parents().each(function() {
$(this).css('overflow', 'visible');
});