From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/list/client.list.php | 141 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 65 deletions(-)
diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php
index 0169810..ae41bef 100644
--- a/interface/web/client/list/client.list.php
+++ b/interface/web/client/list/client.list.php
@@ -13,34 +13,34 @@
// Name of the list
-$liste["name"] = "clients";
+$liste["name"] = "clients";
// Database table
-$liste["table"] = "client";
+$liste["table"] = "client";
// Index index field of the database table
-$liste["table_idx"] = "client_id";
+$liste["table_idx"] = "client_id";
// Search Field Prefix
-$liste["search_prefix"] = "search_";
+$liste["search_prefix"] = "search_";
// Records per page
-$liste["records_per_page"] = "15";
+$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "client_list.php";
+$liste["file"] = "client_list.php";
// Script file of the edit form
-$liste["edit_file"] = "client_edit.php";
+$liste["edit_file"] = "client_edit.php";
// Script File of the delete script
-$liste["delete_file"] = "client_del.php";
+$liste["delete_file"] = "client_del.php";
// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
+$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable authe
-$liste["auth"] = "yes";
+$liste["auth"] = "yes";
/*****************************************************
@@ -48,71 +48,82 @@
*****************************************************/
$liste["item"][] = array( 'field' => "client_id",
- 'datatype' => "INTEGER",
- 'formtype' => "TEXT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "INTEGER",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "company_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "contact_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "customer_no",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "username",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "city",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
$liste["item"][] = array( 'field' => "country",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- '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' => "");
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ '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' => "");
+
+if(is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){
+ $liste["item"][] = array( 'field' => "validation_status",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => array('accept' => 'accept', 'review' => 'review', 'reject' => 'reject'));
+}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1