2 commits - lib/api lib/client
Aleksander Machniak
machniak at kolabsys.com
Thu Apr 11 14:35:33 CEST 2013
lib/api/kolab_api_service_form_value.php | 4 +++-
lib/client/kolab_client_task_settings.php | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 230412594a66265950999402d2992286b6e152c7
Author: Aleksander Machniak <alec at alec.pl>
Date: Thu Apr 11 14:35:10 2013 +0200
Fix resources mail address generation
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 970c5f3..8003173 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -59,10 +59,12 @@ class kolab_api_service_form_value extends kolab_api_service
*/
public function generate($getdata, $postdata)
{
- $attribs = $this->object_type_attributes($postdata['object_type'], $postdata['type_id']);
+ $attribs = $this->object_type_attributes($postdata['object_type'], $postdata['type_id'], true, $type_key);
$attributes = (array) $postdata['attributes'];
$result = array();
+ $postdata['type_key'] = $type_key;
+
foreach ($attributes as $attr_name) {
if (empty($attr_name)) {
continue;
commit d3908cba131dcb7c1c54d3f8009f961c67f31c55
Author: Aleksander Machniak <alec at alec.pl>
Date: Thu Apr 11 14:26:04 2013 +0200
Fix handling value of static field when it's an array
diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php
index ec55c73..f91986c 100644
--- a/lib/client/kolab_client_task_settings.php
+++ b/lib/client/kolab_client_task_settings.php
@@ -633,6 +633,7 @@ class kolab_client_task_settings extends kolab_client_task
if ($data['attributes']['fields'][$attr]) {
$valtype = 'static';
$_data = $data['attributes']['fields'][$attr];
+ $_data = is_array($_data) ? implode(',', $_data) : $_data;
$value = $this->translate('attribute.value.static') . ': ' . kolab_html::escape($_data);
}
else if (isset($data['attributes']['auto_form_fields'][$attr])) {
More information about the commits
mailing list