[Phpgroupware-cvs] addressbook/inc/class.uiaddressbook.inc.php, 1.36.2.15.2.55

[nomail]

Update of /addressbook/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.uiaddressbook.inc.php

date: 2004/05/08 04:43:27;  author: jarg;  state: Exp;  lines: +6 -4

Log Message:
patch #3011 by skwashd
=====================================================================
Index: addressbook/inc/class.uiaddressbook.inc.php
diff -u addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.54 
addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.55
--- addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.54  Tue May  4 
18:24:05 2004
+++ addressbook/inc/class.uiaddressbook.inc.php Sat May  8 04:43:27 2004
@@ -302,7 +302,9 @@
 
                        if(!in_array($this->order, $fields))
                        {
-                               $this->order = 'contact_id';
+                               $this->order = (($this->section == 
$this->tab_main_organizations) 
+                                               ? 'org_name' 
+                                               : 'last_name');
                        }
                        
                        $fields_comms = array_keys($comms_array);
@@ -3058,7 +3060,7 @@
                function get_persons($fields_to_search, $current_person)
                {
                        $criteria = 
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'',$fields_to_search);
-                       $persons = 
$this->bo->get_persons($fields_to_search,'','','','','',$criteria);
+                       $persons = 
$this->bo->get_persons($fields_to_search,'','','first_name','','',$criteria);
 
                        if ($persons)
                        {
@@ -3082,7 +3084,7 @@
                function get_orgs($fields_to_search, $current_orgs)
                {
                        $criteria = 
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'',$fields_to_search);
-                       $orgs = 
$this->bo->get_orgs($fields_to_search,'','','','','',$criteria);
+                       $orgs = 
$this->bo->get_orgs($fields_to_search,'','','org_name','','',$criteria);
                        if ($orgs)
                        {
                                foreach ($orgs as $k => $v)