Skip to content

Commit 77eeb09

Browse files
author
vogelor
committed
Improvement of the domain - module : The group, the domain belongs to is also listed
1 parent f8b4d5b commit 77eeb09

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

interface/web/domain/domain_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function onSubmit() {
108108
if(isset($this->dataRecord['client_group_id']) && $this->dataRecord['client_group_id'] == 0) {
109109
$app->tform->errorMessage .= $wb['error_client_group_id_empty'];
110110
}
111-
//* make sure that the email domain is lowercase
111+
//* make sure that the domain is lowercase
112112
if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
113113
}
114114
else {

interface/web/domain/list/domain.list.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,24 @@
7676
$liste["item"][] = array( 'field' => "domain",
7777
'datatype' => "VARCHAR",
7878
'formtype' => "TEXT",
79-
'op' => "like",
79+
'op' => "LIKE",
8080
'prefix' => "%",
8181
'suffix' => "%",
8282
'width' => "",
8383
'value' => "");
84+
85+
$liste["item"][] = array( 'field' => "sys_groupid",
86+
'datatype' => "VARCHAR",
87+
'formtype' => "SELECT",
88+
'op' => "=",
89+
'prefix' => "",
90+
'suffix' => "",
91+
'datasource' => array ( 'type' => 'SQL',
92+
'querystring' => 'SELECT a.groupid, a.name FROM sys_group a, domain b WHERE (a.groupid = b.sys_groupid) AND ({AUTHSQL-B}) ORDER BY name',
93+
'keyfield'=> 'groupid',
94+
'valuefield'=> 'name'
95+
),
96+
'width' => "",
97+
'value' => "");
98+
8499
?>

interface/web/domain/templates/domain_list.htm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@ <h2><tmpl_var name="list_head_txt"></h2>
2525
<thead>
2626
<tr>
2727
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
28+
<th class="tbl_col_domain" scope="col"><tmpl_var name="user_txt"></th>
2829
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
2930
</tr>
3031
<tr>
3132
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
32-
<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','domain/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
33+
<td class="tbl_col_user"><select name="search_sys_groupid" onChange="submitForm('pageForm','domain/domain_list.php');">{tmpl_var name='search_sys_groupid'}</select></td>
34+
<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','domain/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
3335
</tr>
3436
</thead>
3537
<tbody>
3638
<tmpl_loop name="records">
3739
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
3840
<td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
41+
<td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
3942
<td class="tbl_col_buttons">
4043
<tmpl_if name="is_admin">
4144
<div class="buttons icons16">

0 commit comments

Comments
 (0)