Skip to content

Commit 14b91f5

Browse files
author
cfoe
committed
added groups to users_list (TODO: name resolution for group_ids)
1 parent b81e1a9 commit 14b91f5

File tree

4 files changed

+42
-31
lines changed

4 files changed

+42
-31
lines changed

‎interface/web/admin/lib/lang/de_users_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb['list_head_txt'] = 'Benutzer';
33
$wb['username_txt'] = 'Benutzername';
44
$wb["client_id_txt"] = 'Client ID';
55
$wb["active_txt"] = 'Aktiv';
6+
$wb["groups_txt"] = 'Gruppen';
67
$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
78
$wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
89
?>

‎interface/web/admin/lib/lang/en_users_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb["list_head_txt"] = 'Users';
33
$wb["username_txt"] = 'Username';
44
$wb["client_id_txt"] = 'Client ID';
55
$wb["active_txt"] = 'Active';
6+
$wb["groups_txt"] = 'Groups';
67
$wb["add_new_record_txt"] = 'Add new user';
78
$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
89
?>

‎interface/web/admin/list/users.list.php‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
*/
1111

1212
//* Name of the list
13-
$liste['name'] = 'users';
13+
$liste['name'] = 'users';
1414

1515
//* Database table
16-
$liste['table'] = 'sys_user';
16+
$liste['table'] = 'sys_user';
1717

1818
//* Primary index column
19-
$liste['table_idx'] = 'userid';
19+
$liste['table_idx'] = 'userid';
2020

2121
//* Search column prefix
2222
$liste['search_prefix'] = 'search_';
@@ -25,10 +25,10 @@
2525
$liste['records_per_page'] = "15";
2626

2727
//* Script file for list
28-
$liste['file'] = 'users_list.php';
28+
$liste['file'] = 'users_list.php';
2929

3030
//* Script file to edit
31-
$liste['edit_file'] = 'users_edit.php';
31+
$liste['edit_file'] = 'users_edit.php';
3232

3333
//* Script file to delete
3434
$liste['delete_file'] = 'users_del.php';
@@ -37,37 +37,43 @@
3737
$liste['paging_tpl'] = 'templates/paging.tpl.htm';
3838

3939
//* Enable auth
40-
$liste['auth'] = 'no';
40+
$liste['auth'] = 'no';
4141

4242

4343
/*****************************************************
4444
* Suchfelder
4545
*****************************************************/
4646

47-
$liste["item"][] = array( 'field' => "client_id",
48-
'datatype' => "INTEGER",
49-
'formtype' => "TEXT",
50-
'op' => "=",
51-
'prefix' => "",
52-
'suffix' => "",
53-
'width' => "",
54-
'value' => "");
55-
56-
$liste["item"][] = array( 'field' => "active",
57-
'datatype' => "VARCHAR",
58-
'formtype' => "SELECT",
59-
'op' => "=",
60-
'prefix' => "",
61-
'suffix' => "",
62-
'width' => "",
63-
'value' => array('1' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'0' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
64-
65-
66-
$liste['item'][] = array( 'field' => 'username',
67-
'datatype' => 'VARCHAR',
68-
'op' => 'like',
69-
'prefix' => '%',
70-
'suffix' => '%',
71-
'width' => '');
47+
$liste["item"][] = array( 'field' => "client_id",
48+
'datatype' => "INTEGER",
49+
'formtype' => "TEXT",
50+
'op' => "=",
51+
'prefix' => "",
52+
'suffix' => "",
53+
'width' => "",
54+
'value' => "");
55+
56+
$liste["item"][] = array( 'field' => "active",
57+
'datatype' => "VARCHAR",
58+
'formtype' => "SELECT",
59+
'op' => "=",
60+
'prefix' => "",
61+
'suffix' => "",
62+
'width' => "",
63+
'value' => array('1' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'0' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
64+
65+
$liste['item'][] = array( 'field' => 'username',
66+
'datatype' => 'VARCHAR',
67+
'op' => 'like',
68+
'prefix' => '%',
69+
'suffix' => '%',
70+
'width' => '');
71+
72+
$liste['item'][] = array( 'field' => 'groups',
73+
'datatype' => 'VARCHAR',
74+
'op' => 'like',
75+
'prefix' => '%',
76+
'suffix' => '%',
77+
'width' => '');
7278

7379
?>

‎interface/web/admin/templates/users_list.htm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
2222
<th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
2323
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
2424
<th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
25+
<th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
2526
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
2627
</tr>
2728
<tr>
2829
<td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
2930
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
3031
<td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
32+
<td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
3133
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
3234
</tr>
3335
</thead>
@@ -37,6 +39,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3739
<td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
3840
<td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
3941
<td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
42+
<td class="tbl_col_groups">{tmpl_var name="groups"}</td>
4043
<td class="tbl_col_buttons">
4144
<div class="buttons icons16">
4245
<tmpl_if name="username" op="!=" value="admin">

0 commit comments

Comments
 (0)