[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.socommon.inc.php,1.6,1.7 clas
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.socommon.inc.php,1.6,1.7 class.solookup.inc.php,1.5,1.6 class.sostandard_2.inc.php,1.2,1.3 class.uistandard_2.inc.php,1.2,1.3 hook_admin.inc.php,1.13,1.14 |
|
Date: |
Mon, 10 Feb 2003 17:33:03 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22900/inc
Modified Files:
class.socommon.inc.php class.solookup.inc.php
class.sostandard_2.inc.php class.uistandard_2.inc.php
hook_admin.inc.php
Log Message:
no message
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.socommon.inc.php 10 Feb 2003 16:46:15 -0000 1.6
--- class.socommon.inc.php 10 Feb 2003 22:33:01 -0000 1.7
***************
*** 77,81 ****
}
! function select_part_of_town($bydel_id='')
{
--- 77,81 ----
}
! function select_part_of_town()
{
***************
*** 96,100 ****
{
! $this->db->query("SELECT id, num FROM fm_property_type
where id >'0' ORDER BY num ");
$i = 0;
--- 96,100 ----
{
! $this->db->query("SELECT id, descr FROM
fm_property_category where id >'0' ORDER BY descr ");
$i = 0;
***************
*** 102,106 ****
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('num'));
$i++;
}
--- 102,106 ----
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('descr'));
$i++;
}
***************
*** 110,114 ****
{
! $this->db->query("SELECT id, num FROM fm_building_type
where id >'0' ORDER BY num ");
$i = 0;
--- 110,114 ----
{
! $this->db->query("SELECT id, descr FROM
fm_building_category where id >'0' ORDER BY descr ");
$i = 0;
***************
*** 116,120 ****
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('num'));
$i++;
}
--- 116,120 ----
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('descr'));
$i++;
}
***************
*** 124,128 ****
{
! $this->db->query("SELECT id, num FROM fm_entrance_type
where id >'0' ORDER BY num ");
$i = 0;
--- 124,128 ----
{
! $this->db->query("SELECT id, descr FROM
fm_entrance_category where id >'0' ORDER BY descr ");
$i = 0;
***************
*** 130,134 ****
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('num'));
$i++;
}
--- 130,134 ----
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('descr'));
$i++;
}
***************
*** 138,142 ****
{
! $this->db->query("SELECT id, num FROM boei_formaal
where id >'0' ORDER BY num ");
$i = 0;
--- 138,142 ----
{
! $this->db->query("SELECT id, descr FROM
fm_apartment_category where id >'0' ORDER BY descr ");
$i = 0;
***************
*** 144,148 ****
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('num'));
$i++;
}
--- 144,148 ----
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('descr'));
$i++;
}
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.solookup.inc.php 10 Feb 2003 16:46:15 -0000 1.5
--- class.solookup.inc.php 10 Feb 2003 22:33:01 -0000 1.6
***************
*** 204,208 ****
. " boei_leietaker ON boei_leieobjekt.leietaker_id =
boei_leietaker.leietaker_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " boei_formaal ON boei_leieobjekt.cat_id =
boei_formaal.id "
. " WHERE $filtermethod $querymethod ";
--- 204,208 ----
. " boei_leietaker ON boei_leieobjekt.leietaker_id =
boei_leietaker.leietaker_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " fm_apartment_category ON boei_leieobjekt.cat_id =
fm_apartment_category.id "
. " WHERE $filtermethod $querymethod ";
***************
*** 620,629 ****
! $sql = "SELECT
boei_leieobjekt.objekt_id,boei_objekt.navn,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,num"
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
. " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " boei_formaal ON boei_leieobjekt.cat_id =
boei_formaal.id "
. " WHERE $filtermethod $querymethod ";
--- 620,629 ----
! $sql = "SELECT
boei_leieobjekt.objekt_id,boei_objekt.navn,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,descr"
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
. " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " fm_apartment_category ON boei_leieobjekt.cat_id =
fm_apartment_category.id "
. " WHERE $filtermethod $querymethod ";
***************
*** 731,735 ****
! $sql = "SELECT
boei_leieobjekt.objekt_id,boei_objekt.navn,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,num,boei_leieobjekt.leietaker_id,
fornavn, etternavn,contact_phone "
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
--- 731,735 ----
! $sql = "SELECT
boei_leieobjekt.objekt_id,boei_objekt.navn,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,fm_apartment_category.descr,boei_leieobjekt.leietaker_id,
fornavn, etternavn,contact_phone "
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
***************
*** 737,741 ****
. " boei_leietaker ON boei_leieobjekt.leietaker_id =
boei_leietaker.leietaker_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " boei_formaal ON boei_leieobjekt.cat_id =
boei_formaal.id "
. " WHERE $filtermethod $querymethod ";
--- 737,741 ----
. " boei_leietaker ON boei_leieobjekt.leietaker_id =
boei_leietaker.leietaker_id $this->join"
. " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
! . " fm_apartment_category ON boei_leieobjekt.cat_id =
fm_apartment_category.id "
. " WHERE $filtermethod $querymethod ";
Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sostandard_2.inc.php 13 Dec 2002 18:13:33 -0000 1.2
--- class.sostandard_2.inc.php 10 Feb 2003 22:33:01 -0000 1.3
***************
*** 113,116 ****
--- 113,128 ----
$table='fm_building_part';
break;
+ case 'property':
+ $table='fm_property_category';
+ break;
+ case 'building':
+ $table='fm_building_category';
+ break;
+ case 'entrance':
+ $table='fm_entrance_category';
+ break;
+ case 'apartment':
+ $table='fm_apartment_category';
+ break;
}
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uistandard_2.inc.php 27 Jan 2003 10:40:31 -0000 1.2
--- class.uistandard_2.inc.php 10 Feb 2003 22:33:01 -0000 1.3
***************
*** 76,81 ****
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.edit&id='
. $standard['id'].'&type='.$type),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.delete&id='
. $standard['id'].'&type='.$type),
! 'lang_view_standardtext'
=> lang('view the standard'),
! 'lang_edit_standardtext'
=> lang('edit the standard'),
'lang_delete_standardtext' =>
lang('delete the standard'),
'text_view'
=> lang('view'),
--- 76,81 ----
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.edit&id='
. $standard['id'].'&type='.$type),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.delete&id='
. $standard['id'].'&type='.$type),
! 'lang_view_standardtext' =>
lang('view the standard'),
! 'lang_edit_standardtext' =>
lang('edit the standard'),
'lang_delete_standardtext' =>
lang('delete the standard'),
'text_view'
=> lang('view'),
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** hook_admin.inc.php 10 Feb 2003 16:46:15 -0000 1.13
--- hook_admin.inc.php 10 Feb 2003 22:33:01 -0000 1.14
***************
*** 24,31 ****
'Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname),
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
! 'Property Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=property'),
! 'Building Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=building'),
! 'Entrance Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=entrance'),
! 'Apartment Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=apartment'),
// 'Property type attributes class'=>
$GLOBALS['phpgw']->link('/property/list_property_type_attribute_class.php'),
'Building Part'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
--- 24,31 ----
'Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname),
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
! 'Property Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=property'),
! 'Building Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building'),
! 'Entrance Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=entrance'),
! 'Apartment Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=apartment'),
// 'Property type attributes class'=>
$GLOBALS['phpgw']->link('/property/list_property_type_attribute_class.php'),
'Building Part'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.socommon.inc.php,1.6,1.7 class.solookup.inc.php,1.5,1.6 class.sostandard_2.inc.php,1.2,1.3 class.uistandard_2.inc.php,1.2,1.3 hook_admin.inc.php,1.13,1.14,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default building.xsl,1.3,1.4 location.xsl,1.1,1.2 lookup.xsl,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.17,1.18 tables_current.inc.php,1.28,1.29
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default building.xsl,1.3,1.4 location.xsl,1.1,1.2 lookup.xsl,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.17,1.18 tables_current.inc.php,1.28,1.29
- Index(es):