Changeset 3211 for branches/2.2/contactcenter/inc/class.ui_data.inc.php

Timestamp:

09/02/10 14:54:07 (14 years ago)

Author:

niltonneto

Message:

Ticket #1185 - Corrigido erro ao listar OU com muitos objetos dentro do Catálogo Geral.

File:

• branches/2.2/contactcenter/inc/class.ui_data.inc.php (modified) (3 diffs)

branches/2.2/contactcenter/inc/class.ui_data.inc.php

@@ -1393 +1393 @@
 
                                                 if($this->page_info['actual_catalog']['class']!='bo_global_ldap_catalog'){
-                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode($contact['names_ordered'])  : 'none';
+                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode(is_array($contact['names_ordered']) ? $contact['names_ordered'][0] : $contact['names_ordered'])  : 'none';
                                                 }
                                                 else {
@@ -2897 +2897 @@
                                 // Get only this attributes: dn, cn for external catalogs,
                                 // used to restrict the attributes used in filters
-                                $ids = $this->bo->find(array($data['fields']['id'], $data['fields']['search']), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'));
+                                $ids = $this->bo->find(array($data['fields']['id'], $data['fields']['search']), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for'] != null);
                         }
                         else
@@ -2909 +2909 @@
                                         //'contact.account_status',
                                         'contact.account_visible'
-                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'] );
+                                        ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'], $data['search_for'] != null );
                         }