Changeset 4470 for sandbox

Timestamp:

05/20/11 11:15:25 (13 years ago)

Author:

airton

Message:

Ticket #1820 - Erro ao criar grupo contendo contato compartilhado - r4444

Location:

sandbox/2.2.0.2/contactcenter

Files:

• inc/class.so_group.inc.php (modified) (1 diff)
• js/ccAddGroup.js (modified) (1 diff)

sandbox/2.2.0.2/contactcenter/inc/class.so_group.inc.php

@@ -141 +141 @@
                         {
                                 $query = 'select'
-                                                . ' phpgw_cc_connections.id_connection,'
-                                                . ' phpgw_cc_contact.id_contact,'
-                                                . ' phpgw_cc_contact.names_ordered,'
-                                                . ' phpgw_cc_contact.alias,'
-                                                . ' phpgw_cc_contact.birthdate,'
-                                                . ' phpgw_cc_contact.sex,'
-                                                . ' phpgw_cc_contact.pgp_key,'
-                                                . ' phpgw_cc_contact.notes,'
-                                                . ' phpgw_cc_contact.web_page,'
-                                                . ' phpgw_cc_contact.corporate_name,'
-                                                . ' phpgw_cc_contact.job_title,'
-                                                . ' phpgw_cc_contact.department,'
-                                                . ' phpgw_cc_connections.connection_name,'
-                                                . ' phpgw_cc_connections.connection_value,'
-                                                . ' phpgw_cc_contact_conns.id_typeof_contact_connection,'
+                                                . ' C.id_connection,'
+                                                . ' A.id_contact,'
+                                                . ' A.names_ordered,'
+                                                . ' A.alias,'
+                                                . ' A.birthdate,'
+                                                . ' A.sex,'
+                                                . ' A.pgp_key,'
+                                                . ' A.notes,'
+                                                . ' A.web_page,'
+                                                . ' A.corporate_name,'
+                                                . ' A.job_title,'
+                                                . ' A.department,'
+                                                . ' C.connection_name,'
+                                                . ' C.connection_value,'
+                                                . ' B.id_typeof_contact_connection,'
                                                 . ' phpgw_cc_contact_addrs.id_typeof_contact_address,'
                                                 . ' phpgw_cc_addresses.address1,'

sandbox/2.2.0.2/contactcenter/js/ccAddGroup.js

@@ -369 +369 @@
                 {
 
-                   var item = data[3][i];
-                   var id = 'ldap:'+data[11]+':'+item[6];
-                   var option = document.createElement('OPTION');
-                   option.value = id;
-                   option.text = item[1]+' ('+item[4]+')';
-                   contact_list.options[contact_list.options.length] = option;
+                                        var item = data[3][i];
+                                        if (data[8] == 'bo_shared_people_manager'){ 
+                                                var id = data[3][i][6]; 
+                                        }        
+                                        else 
+                                        { 
+                                                var id = 'ldap:'+data[11]+':'+item[6]; 
+                                        }
+                                        var option = document.createElement('OPTION');
+                                        option.value = id;
+                                        option.text = item[1]+' ('+item[4]+')';
+                                        contact_list.options[contact_list.options.length] = option;
                 }