From 74410e7a1baa4e5844df6df56733bbd05bd8241b Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Fri, 17 Aug 2012 10:30:26 +0000
Subject: [PATCH] fixed display of country in client/reseller list
---
interface/web/client/list/client.list.php | 5 +++++
interface/web/client/list/reseller.list.php | 7 ++++++-
interface/web/client/templates/clients_list.htm | 2 +-
interface/web/client/templates/resellers_list.htm | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php
index 2d45179814..900f753e6f 100644
--- a/interface/web/client/list/client.list.php
+++ b/interface/web/client/list/client.list.php
@@ -98,6 +98,11 @@ $liste["item"][] = array( 'field' => "country",
'op' => "=",
'prefix' => "",
'suffix' => "",
+ 'datasource'=> array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY iso ASC',
+ 'keyfield' => 'iso',
+ 'valuefield' => 'printable_name'
+ ),
'width' => "",
'value' => "");
diff --git a/interface/web/client/list/reseller.list.php b/interface/web/client/list/reseller.list.php
index 2e2fbe7f81..e1368647e4 100644
--- a/interface/web/client/list/reseller.list.php
+++ b/interface/web/client/list/reseller.list.php
@@ -89,7 +89,12 @@ $liste["item"][] = array( 'field' => "country",
'op' => "=",
'prefix' => "",
'suffix' => "",
+ 'datasource'=> array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name ASC',
+ 'keyfield' => 'iso',
+ 'valuefield' => 'printable_name'
+ ),
'width' => "",
- 'value' => "");
+ 'value' => "" );
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index bc4bb9c54c..2e906d00be 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -32,7 +32,7 @@
<td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
<td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
<td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
- <td class="tbl_col_country"><select name="search_country" style="width:120px;">{tmpl_var name='search_country'}</select></td>
+ <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
<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','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index de8ce3437a..42a9a0cc9a 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -30,7 +30,7 @@
<td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
<td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
<td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
- <td class="tbl_col_country"><select name="search_country" style="width:120px;">{tmpl_var name='search_country'}</select></td>
+ <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
<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','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
--
GitLab