From dedc7623d340a3a982ee0ab191d9ff52ffa79e5e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 12 Dec 2012 05:13:27 -0500
Subject: [PATCH] Fixed: FS#2579 - APS Packagelist: SQL error when using filter
---
interface/web/sites/templates/aps_instances_list.htm | 6 +++---
interface/web/sites/list/aps_installedpackages.list.php | 14 ++++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/interface/web/sites/list/aps_installedpackages.list.php b/interface/web/sites/list/aps_installedpackages.list.php
index 573df2a..2b2f32e 100644
--- a/interface/web/sites/list/aps_installedpackages.list.php
+++ b/interface/web/sites/list/aps_installedpackages.list.php
@@ -58,14 +58,16 @@
'width' => '',
'value' => '');
-$liste["item"][] = array('field' => 'customer_name',
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'op' => 'LIKE',
- 'prefix' => '%',
- 'suffix' => '%',
+ /*
+$liste["item"][] = array('field' => 'customer_id',
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'op' => '=',
+ 'prefix' => '',
+ 'suffix' => '',
'width' => '',
'value' => '');
+*/
$liste["item"][] = array('field' => 'instance_status',
'datatype' => 'VARCHAR',
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index b1b673d..48da523 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -10,7 +10,7 @@
<th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
<th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
<tmpl_if name='is_noclient'>
- <th class="tbl_col_customer" scope="col">{tmpl_var name='customer_txt'}</th>
+ <!--<th class="tbl_col_customer" scope="col">{tmpl_var name='customer_txt'}</th>-->
</tmpl_if>
<th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
<th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
@@ -20,7 +20,7 @@
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
<tmpl_if name='is_noclient'>
- <td class="tbl_col_customer"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>
+ <!--<td class="tbl_col_customer"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>-->
</tmpl_if>
<td class="tbl_col_installlocation"> </td>
<td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
@@ -35,7 +35,7 @@
<td class="tbl_col_name"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='package_name'}</a></td>
<td class="tbl_col_version">{tmpl_var name='package_version'}-{tmpl_var name='package_release'}</td>
<tmpl_if name='is_noclient'>
- <td class="tbl_col_customer"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='customer_name'}</a></td>
+ <!--<td class="tbl_col_customer"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='customer_name'}</a></td>-->
</tmpl_if>
<td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
<td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
--
Gitblit v1.9.1