From e372dd6925058eddf34e5b2b5ca59a5707befb37 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 11 Oct 2013 02:58:52 -0400
Subject: [PATCH] Implemented:  - javascript hooks prepared (onAfterContentLoad is first available hook)  - new abstract class for GET and POST requests  - new js.d directory that is included into main template

---
 interface/web/admin/form/server_php.tform.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index e5fcb7b..58c1d7f 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.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,7 @@
 	- 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.
 
 
 */
@@ -100,7 +100,7 @@
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
 			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT client_id,CONCAT(contact_name,' :: ',username) as name FROM client WHERE {AUTHSQL} ORDER BY contact_name",
+										'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'
 									 ),

--
Gitblit v1.9.1