Changeset 4396

Timestamp:

05/12/11 16:51:01 (13 years ago)

Author:

niltonneto

Message:

Ticket #1860 - Resolvendo problema de edição de grupo compartilhado

File:

• trunk/contactcenter/inc/class.so_group.inc.php (modified) (4 diffs)

trunk/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,'
@@ -167 +167 @@
 
                                 $query .= ' from'
-                                                . ' phpgw_cc_contact'
-                                                . ' inner join phpgw_cc_contact_conns on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_conns.id_contact )'
-                                                . ' inner join phpgw_cc_connections on ( phpgw_cc_contact_conns.id_connection = phpgw_cc_connections.id_connection )'
-                                                . ' left join phpgw_cc_contact_addrs on ( phpgw_cc_contact.id_contact = phpgw_cc_contact_addrs.id_contact )'
+                                                . ' phpgw_cc_contact A'
+                                                . ' inner join phpgw_cc_contact_conns B on ( A.id_contact = B.id_contact )'
+                                                . ' inner join phpgw_cc_connections C on ( B.id_connection = C.id_connection )'
+                                                . ' left join phpgw_cc_contact_addrs on ( A.id_contact = phpgw_cc_contact_addrs.id_contact )'
                                                 . ' left join phpgw_cc_addresses on ( phpgw_cc_contact_addrs.id_address = phpgw_cc_addresses.id_address )'
                                                 . ' left join phpgw_cc_city on ( phpgw_cc_addresses.id_city = phpgw_cc_city.id_city )'
@@ -177 +177 @@
 
                                 $query .= ' where'
-                                                . " phpgw_cc_contact.id_owner = {$this->owner}"
+                                                . " A.id_owner = {$this->owner}"
                                                 //. ' and phpgw_cc_connections.connection_is_default = true'
                                                 ;
@@ -196 +196 @@
 
                         if ( $field == 'only_email' )
-                                $query .= 'and phpgw_cc_contact_conns.id_typeof_contact_connection = 1 ';
-
-                        $query .= ' order by phpgw_cc_contact.names_ordered, phpgw_cc_connections.connection_value';
+                                $query .= ' and B.id_typeof_contact_connection = 1 ';
+
+                        $query .= ' order by A.names_ordered, C.connection_value';
 
                         if (!$this->db->query($query))