From f6dd53c7bccfe98a5f7e9e4aaf0ed70fae9bb200 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 18 Sep 2012 09:11:16 -0400
Subject: [PATCH] Bugfix: Client tform cannot be loaded this way (remoting / plugin), changed it
---
interface/lib/classes/client_templates.inc.php | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/interface/lib/classes/client_templates.inc.php b/interface/lib/classes/client_templates.inc.php
index 3acc2df..7aae92d 100644
--- a/interface/lib/classes/client_templates.inc.php
+++ b/interface/lib/classes/client_templates.inc.php
@@ -12,6 +12,8 @@
function apply_client_templates($clientId) {
global $app;
+ include('../client/form/client.tform.php');
+
/*
* Get the master-template for the client
*/
@@ -71,7 +73,7 @@
}
/* process the string limits (CHECKBOXARRAY, SELECT etc.) */
elseif (is_string($v)){
- switch ($app->tform->formDef["tabs"]["limits"]["fields"][$k]['formtype']){
+ switch ($form["tabs"]["limits"]["fields"][$k]['formtype']){
case 'CHECKBOXARRAY':
if (!isset($limits[$k])){
$limits[$k] = array();
@@ -79,20 +81,20 @@
$limits_values = $limits[$k];
if (is_string($limits[$k])){
- $limits_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
+ $limits_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
}
- $additional_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$v);
+ $additional_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$v);
/* unification of limits_values (master template) and additional_values (additional template) */
$limits_unified = array();
- foreach($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
+ foreach($form["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
if (in_array($key,$limits_values) || in_array($key,$additional_values)) $limits_unified[] = $key;
}
- $limits[$k] = implode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
+ $limits[$k] = implode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
break;
case 'SELECT':
- $limit_values = array_keys($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"]);
+ $limit_values = array_keys($form["tabs"]["limits"]["fields"][$k]["value"]);
/* choose the lower index of the two SELECT items */
$limits[$k] = $limit_values[min(array_search($limits[$k], $limit_values), array_search($v, $limit_values))];
break;
@@ -118,5 +120,6 @@
$sql = 'UPDATE client SET ' . $update . " WHERE client_id = " . $app->functions->intval($clientId);
$app->db->query($sql);
}
+ unset($form);
}
}
\ No newline at end of file
--
Gitblit v1.9.1