fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [13058] load autocomplete


From: Sigurd Nes
Subject: [Fmsystem-commits] [13058] load autocomplete
Date: Wed, 22 Apr 2015 08:38:39 +0000

Revision: 13058
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13058
Author:   sigurdne
Date:     2015-04-22 08:38:39 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
load autocomplete

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uientity.inc.php

Modified: branches/dev-syncromind/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-04-22 
08:37:14 UTC (rev 13057)
+++ branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-04-22 
08:38:39 UTC (rev 13058)
@@ -1726,14 +1726,24 @@
 
                                $location = 
".{$this->type}.{$this->entity_id}.{$this->cat_id}";
                                $attributes_groups = 
$this->bo->get_attribute_groups($location, $values['attributes']);
-
+//                             _debug_array($attributes_groups);
                                $attributes_general = array();
                                $i = -1;
                                $attributes = array();
+
+                               $_dummy = array(array(
+//                                     'id' => 0,
+//                                     'datatype' => 'R',
+//                                     'nullable' => 1,
+                               ));
                                foreach ($attributes_groups as $_key => $group)
                                {
-                                       if(isset($group['attributes']) && 
(isset($group['group_sort']) || !$location_data))
+                                       if(!isset($group['attributes']))
                                        {
+                                               $group['attributes'] = $_dummy;
+                                       }
+                                       if((isset($group['group_sort']) || 
!$location_data))
+                                       {
                                                if($group['level'] == 0)
                                                {
                                                        $_tab_name = 
str_replace(' ', '_', $group['name']);
@@ -1755,7 +1765,7 @@
                                                }
                                                unset($_tab_name);
                                        }
-                                       else if(isset($group['attributes']) && 
!isset($group['group_sort']) && $location_data)
+                                       else if(!isset($group['group_sort']) && 
$location_data)
                                        {
                                                $attributes_general = 
array_merge($attributes_general,$group['attributes']);
                                        }
@@ -2136,6 +2146,8 @@
                        //$category['org_unit'] =1;
                        if($category['org_unit'] && $mode == 'edit')
                        {
+                               phpgwapi_jquery::load_widget('autocomplete');
+
                                        $_autocomplete = <<<JS
 
                                        $(document).ready(function () 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]