[Phpgroupware-cvs] CVS: property/inc class.solookup.inc.php,1.1,1.2 class.uilookup.inc.php,1.1,1.2 class.uiproperty.inc.php,1.1,1.2

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv12705/inc

Modified Files:
        class.solookup.inc.php class.uilookup.inc.php 
        class.uiproperty.inc.php 
Log Message:
no message

Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.solookup.inc.php      27 Dec 2002 19:03:27 -0000      1.1
--- class.solookup.inc.php      28 Dec 2002 17:25:45 -0000      1.2
***************
*** 159,163 ****
                                        }
                                        reset($public_user_list);
!                                       $filtermethod .= " OR (access='public' 
OR owner IN(" . implode(',',$public_user_list) . ")))";
                                }
                                else
--- 159,163 ----
                                        }
                                        reset($public_user_list);
!                                       $filtermethod .= " OR 
(boei_leieobjekt.access='public' OR boei_leieobjekt.owner IN(" . 
implode(',',$public_user_list) . ")))";
                                }
                                else
***************
*** 188,192 ****
                        }
  
!                       $sql = "SELECT 
objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,tid,owner,access,cat_id,property_type_id,location_code
  FROM boei_leieobjekt $this->join boei_gateadresse  ON 
boei_leieobjekt.gateadresse_id=boei_gateadresse.gateadresse_id WHERE (Not 
(boei_leieobjekt.formaal_id)='99') AND $filtermethod $querymethod  ";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
--- 188,192 ----
                        }
  
!                       $sql = "SELECT 
objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,tid,owner,access,cat_id,property_type_id,location_code
  FROM boei_leieobjekt $this->join boei_gateadresse  ON 
boei_leieobjekt.gateadresse_id=boei_gateadresse.gateadresse_id ";//WHERE (Not 
(boei_leieobjekt.formaal_id)='99') AND $filtermethod $querymethod  ";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
***************
*** 208,212 ****
                        }
  
! _debug_array($property);
  
                        return $property;
--- 208,212 ----
                        }
  
! //_debug_array($property);
  
                        return $property;

Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uilookup.inc.php      27 Dec 2002 19:03:27 -0000      1.1
--- class.uilookup.inc.php      28 Dec 2002 17:25:45 -0000      1.2
***************
*** 105,109 ****
--- 105,125 ----
                        $table_header[] = array
                        (
+                               'sort_name'     => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'org_name',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
                                'lang_name'             => lang('Name'),
+                               'sort_id'       => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'id',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
                                'lang_id'               => lang('ID'),
                                'lang_select'           => lang('Select')
***************
*** 120,123 ****
--- 136,141 ----
                                'menuaction'            => 
$this->currentapp.'.uilookup.addressbook',
                                'second_display'        => true,
+                               'order'                         => $this->order,
+                               'sort'                          => $this->sort,
                                'cat_id'                        => 
$this->cat_id,
                                'query'                         => $this->query,
***************
*** 190,193 ****
--- 208,219 ----
                        $table_header[] = array
                        (
+                               'sort_property' => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'objekt_id',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.property',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
                                'lang_property'         => lang('Property'),
                                'lang_building'         => lang('Building'),
***************
*** 195,198 ****
--- 221,232 ----
                                'lang_floor'            => lang('Floor'),
                                'lang_apartment'                => 
lang('Apartment'),
+                               'sort_street_name'      => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'gatenavn',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.property',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
                                'lang_street_name'              => lang('Street 
Name'),
                                'lang_street_num'               => lang('Num'),
***************
*** 208,212 ****
                        $link_select = array
                        (
!                               'menuaction'            => 
$this->currentapp.'.uilookup.addressbook',
                                'cat_id'                        => 
$this->cat_id,
                                'query'                         => $this->query,
--- 242,248 ----
                        $link_select = array
                        (
!                               'menuaction'            => 
$this->currentapp.'.uilookup.property',
!                               'order'                         => $this->order,
!                               'sort'                          => $this->sort,
                                'cat_id'                        => 
$this->cat_id,
                                'query'                         => $this->query,

Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiproperty.inc.php    11 Dec 2002 19:31:22 -0000      1.1
--- class.uiproperty.inc.php    28 Dec 2002 17:25:45 -0000      1.2
***************
*** 76,84 ****
                        $links = $this->bocommon->menu($sub);
  
- //echo 'hei';
- //print_r($links);
- //print_();
- 
- 
                        $property_list = $this->bo->read();
  
--- 76,79 ----