lib/api lib/kolab_api_service.php lib/kolab_client_task.php

Aleksander Machniak machniak at kolabsys.com
Fri Mar 30 19:22:39 CEST 2012


 lib/api/kolab_api_service_group_types.php |    2 +-
 lib/kolab_api_service.php                 |   14 +++++++-------
 lib/kolab_client_task.php                 |    5 ++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 8ee970d8a00ee29a1640eda03e4261ad717b9bcc
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 30 19:20:47 2012 +0200

    Some fixes

diff --git a/lib/api/kolab_api_service_group_types.php b/lib/api/kolab_api_service_group_types.php
index e564c06..ade6765 100644
--- a/lib/api/kolab_api_service_group_types.php
+++ b/lib/api/kolab_api_service_group_types.php
@@ -53,7 +53,7 @@ class kolab_api_service_group_types extends kolab_api_service
     public function group_types_list($get, $post)
     {
         $group_types = $this->object_types('group');
-
+console($group_types);
         return array(
             'list'  => $group_types,
             'count' => count($group_types),
diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php
index dfe69ea..f1b0b95 100644
--- a/lib/kolab_api_service.php
+++ b/lib/kolab_api_service.php
@@ -60,8 +60,8 @@ abstract class kolab_api_service
     protected function object_type_attributes($object_name, $type_id, $required = true)
     {
         $supported = array('group', 'user');
-        if (!in_array($object_name, $supported)) {
-        
+        if (!$object_name || !in_array($object_name, $supported)) {
+            return array();
         }
     
         if (empty($type_id)) {
@@ -141,15 +141,15 @@ abstract class kolab_api_service
      */
     protected function object_types($object_name)
     {
-        if (!empty($this->cache['object_types']) && !empty($this->cache['object_types'][$object_name])) {
-            return $this->cache['object_types'][$object_name];
-        }
-
         $supported = array('group', 'user');
-        if (!in_array($object_name, $supported)) {
+        if (!$object_name || !in_array($object_name, $supported)) {
             return array();
         }
 
+        if (!empty($this->cache['object_types']) && !empty($this->cache['object_types'][$object_name])) {
+            return $this->cache['object_types'][$object_name];
+        }
+
         $sql_result   = $this->db->query("SELECT * FROM {$object_name}_types");
         $object_types = array();
 
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 91039f1..2acf4e6 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -781,7 +781,10 @@ class kolab_client_task
         // (Re-|Pre-)populate auto_form_fields
         if ($add_mode) {
             if (!empty($auto_attribs)) {
-                $data = array_merge((array)$data, array('attributes' => $auto_attribs));
+                $data = array_merge((array)$data, array(
+                    'attributes'  => $auto_attribs,
+                    'object_name' => $name,
+                ));
                 $resp = $this->api->post('form_value.generate', null, $data);
                 $data = array_merge((array)$data, (array)$resp->get());
             }





More information about the commits mailing list