[Phpgroupware-cvs] property/inc class.uilocation.inc.php class.soc...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/12 09:50:40

Modified files:
        inc            : class.uilocation.inc.php class.socommon.inc.php 
                         class.bocommon.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.socommon.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.47&r2=1.48

Patches:
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.uilocation.inc.php    11 Oct 2006 10:14:53 -0000      1.38
+++ class.uilocation.inc.php    12 Oct 2006 09:50:40 -0000      1.39
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.38 2006/10/11 10:14:53 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.39 2006/10/12 09:50:40 
sigurdne Exp $
        */
 
        /**
@@ -436,7 +436,7 @@
                                'lang_no_status'                        => 
lang('No status'),
                                'status_list'                           => 
$this->bo->select_status_list('filter',$this->status),
 
-                               'part_of_town_list'                             
=> $this->bocommon->select_part_of_town('filter',$this->part_of_town_id),
+                               'part_of_town_list'                             
=> 
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id,$this->district_id),
                                'lang_no_part_of_town'                          
=> lang('no part of town'),
                                'lang_town_statustext'                          
=> lang('Select the part of town the selection belongs to. To do not use a part 
of town select NO PART OF TOWN'),
                                'select_name_part_of_town'                      
=> 'part_of_town_id',
@@ -1611,7 +1611,6 @@
                                $owner_list = 
$this->bo->get_owner_type_list('filter', $this->filter);
                        }
 
-
                        $data = array
                        (
                                'links'                                 => 
$links,
@@ -1621,7 +1620,7 @@
                                'lang_show_all'                         => 
lang('Show all'),
                                'lang_owner_statustext'                 => 
lang('Select the owner type. To show all entries select SHOW ALL'),
                                'select_name_part_of_town'              => 
'part_of_town_id',
-                               'part_of_town_list'                     => 
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id),
+                               'part_of_town_list'                     => 
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id,$this->district_id),
                                'lang_town_statustext'                  => 
lang('Select the part of town the property belongs to. To do not use a part of 
town -  select NO PART OF TOWN'),
                                'lang_no_part_of_town'                  => 
lang('No Part of town'),
 

Index: class.socommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.socommon.inc.php      12 Oct 2006 09:09:27 -0000      1.31
+++ class.socommon.inc.php      12 Oct 2006 09:50:40 -0000      1.32
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.socommon.inc.php,v 1.31 2006/10/12 09:09:27 
sigurdne Exp $
+       * @version $Id: class.socommon.inc.php,v 1.32 2006/10/12 09:50:40 
sigurdne Exp $
        */
 
        /**
@@ -250,9 +250,14 @@
                        }
                }
 
-               function select_part_of_town()
+               function select_part_of_town($district_id='')
                {
-                       $this->db->query("SELECT name, part_of_town_id FROM 
fm_part_of_town ORDER BY name ");
+                       $filter = '';
+                       if($district_id)
+                       {
+                               $filter = "WHERE district_id = '$district_id'";
+                       }
+                       $this->db->query("SELECT name, part_of_town_id FROM 
fm_part_of_town $filter ORDER BY name ",__LINE__,__FILE__);
 
                        $i = 0;
                        while ($this->db->next_record())

Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- class.bocommon.inc.php      12 Oct 2006 09:09:27 -0000      1.47
+++ class.bocommon.inc.php      12 Oct 2006 09:50:40 -0000      1.48
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.bocommon.inc.php,v 1.47 2006/10/12 09:09:27 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.48 2006/10/12 09:50:40 
sigurdne Exp $
        */
 
        /**
@@ -1137,7 +1137,7 @@
 
                }
 
-               function select_part_of_town($format='',$selected='')
+               function 
select_part_of_town($format='',$selected='',$district_id='')
                {
                        switch($format)
                        {
@@ -1149,7 +1149,7 @@
                                        break;
                        }
 
-                       $parts= $this->socommon->select_part_of_town();
+                       $parts= 
$this->socommon->select_part_of_town($district_id);
 
                        while (is_array($parts) && list(,$part) = each($parts))
                        {