From 7d52e00a51450bc4a080d4e21b7dda02c0a65191 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 05:42:06 -0500
Subject: [PATCH] Fixed list sorting
---
interface/web/admin/form/server_ip.tform.php | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/interface/web/admin/form/server_ip.tform.php b/interface/web/admin/form/server_ip.tform.php
index b54a3f1..e565e1e 100644
--- a/interface/web/admin/form/server_ip.tform.php
+++ b/interface/web/admin/form/server_ip.tform.php
@@ -34,9 +34,9 @@
Tabellendefinition
Datentypen:
- - INTEGER (Wandelt Ausdr�cke in Int um)
+ - INTEGER (Wandelt Ausdrücke in Int um)
- DOUBLE
- - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
+ - CURRENCY (Formatiert Zahlen nach Währungsnotation)
- VARCHAR (kein weiterer Format Check)
- TEXT (kein weiterer Format Check)
- DATE (Datumsformat, Timestamp Umwandlung)
@@ -54,7 +54,12 @@
- Wert oder Array
Hinweis:
- Das ID-Feld ist nicht bei den Table Values einzuf�gen.
+ Das ID-Feld ist nicht bei den Table Values einzufügen.
+
+ Search:
+ - searchable = 1 or searchable = 2 include the field in the search
+ - searchable = 1: this field will be the title of the search result
+ - searchable = 2: this field will be included in the description of the search result
*/
@@ -95,16 +100,31 @@
),
'value' => ''
),
+ 'client_id' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => "SELECT client_id,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM client WHERE {AUTHSQL} ORDER BY contact_name",
+ 'keyfield'=> 'client_id',
+ 'valuefield'=> 'name'
+ ),
+ 'value' => array(0 => ' ')
+ ),
+ 'ip_type' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('IPv4' => 'IPv4', 'IPv6' => 'IPv6'),
+ 'searchable' => 2
+ ),
'ip_address' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'ip_error_empty'),
+ 'validators' => array ( 0 => array ( 'type' => 'ISIP',
+ 'errmsg'=> 'ip_error_wrong'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'ip_error_unique'),
- 2 => array ( 'type' => 'REGEX',
- 'regex' => '/^[0-9\.]{7,15}$/',
- 'errmsg'=> 'ip_err'),
),
'default' => '',
'value' => '',
@@ -112,7 +132,8 @@
'width' => '15',
'maxlength' => '15',
'rows' => '',
- 'cols' => ''
+ 'cols' => '',
+ 'searchable' => 1
),
'virtualhost' => array (
'datatype' => 'VARCHAR',
@@ -120,6 +141,21 @@
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
+ 'virtualhost_port' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^([0-9]{1,5}\,{0,1}){1,}$/i',
+ 'errmsg'=> 'error_port_syntax'),
+ ),
+ 'default' => '80,443',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '15',
+ 'maxlength' => '15',
+ 'rows' => '',
+ 'cols' => ''
+ ),
##################################
# ENDE Datenbankfelder
##################################
--
Gitblit v1.9.1