[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.7,1.8 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.7,1.8 class.soapartment.inc.php,1.4,1.5 class.sobuilding.inc.php,1.12,1.13 class.soentrance.inc.php,1.4,1.5 class.soproperty.inc.php,1.16,1.17class.uiapartment.inc.php,1.12,1.13 class.uibuilding.inc.php,1.20,1.21 |
|
Date: |
Fri, 23 May 2003 12:24:11 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv5045/inc
Modified Files:
class.bobuilding.inc.php class.soapartment.inc.php
class.sobuilding.inc.php class.soentrance.inc.php
class.soproperty.inc.php class.uiapartment.inc.php
class.uibuilding.inc.php
Log Message:
no message
Index: class.bobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bobuilding.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.bobuilding.inc.php 23 May 2003 08:40:19 -0000 1.7
--- class.bobuilding.inc.php 23 May 2003 16:24:08 -0000 1.8
***************
*** 185,191 ****
}
! function delete($property_id,$building_id)
{
! $this->so->delete($property_id,$building_id);
}
}
--- 185,191 ----
}
! function delete($location_code)
{
! $this->so->delete($location_code);
}
}
Index: class.soapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soapartment.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soapartment.inc.php 18 May 2003 10:59:14 -0000 1.4
--- class.soapartment.inc.php 23 May 2003 16:24:08 -0000 1.5
***************
*** 177,180 ****
--- 177,183 ----
$apartment['remark']. "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO fm_location
(location_code,type) "
+ . "VALUES ('". $apartment['location_code'].
"','apartment')",__LINE__,__FILE__);
+
$receipt['message'][] = array('msg'=>lang('Apartment
has been saved'));
return $receipt;
***************
*** 202,205 ****
--- 205,209 ----
{
$this->db->query("DELETE FROM fm_apartment WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_location WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
}
}
Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.sobuilding.inc.php 21 May 2003 20:09:51 -0000 1.12
--- class.sobuilding.inc.php 23 May 2003 16:24:08 -0000 1.13
***************
*** 143,146 ****
--- 143,149 ----
. "','" . $building['general_address'] ."','" .
$building['cat_id'] ."','" . $building['remark']. "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO fm_location
(location_code,type) "
+ . "VALUES ('". $building['location_code'].
"','building')",__LINE__,__FILE__);
+
$receipt['message'][] = array('msg'=>lang('Building has
been saved'));
return $receipt;
***************
*** 160,166 ****
}
! function delete($property_id,$building_id )
{
! $this->db->query("DELETE FROM fm_building WHERE
property_id='$property_id' and building_id='$building_id'",__LINE__,__FILE__);
}
}
--- 163,170 ----
}
! function delete($location_code)
{
! $this->db->query("DELETE FROM fm_building WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
! $this->db->query("DELETE FROM fm_location WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
}
}
Index: class.soentrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentrance.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soentrance.inc.php 18 May 2003 10:59:14 -0000 1.4
--- class.soentrance.inc.php 23 May 2003 16:24:08 -0000 1.5
***************
*** 153,156 ****
--- 153,159 ----
$entrance['remark']. "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO fm_location
(location_code,type) "
+ . "VALUES ('". $entrance['location_code'].
"','entrance')",__LINE__,__FILE__);
+
$receipt['message'][] = array('msg'=>lang('Entrance has
been saved'));
return $receipt;
***************
*** 175,178 ****
--- 178,182 ----
{
$this->db->query("DELETE FROM fm_entrance WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_location WHERE
location_code='" . $location_code ."'",__LINE__,__FILE__);
}
}
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.soproperty.inc.php 18 May 2003 10:59:14 -0000 1.16
--- class.soproperty.inc.php 23 May 2003 16:24:09 -0000 1.17
***************
*** 53,57 ****
{
$owners[$i]['id'] =
$this->db->f('owner_id');
! $owners[$i]['name'] =
stripslashes($this->db->f('name')) . ' ['. $this->db->f('category') . ']';
$i++;
}
--- 53,57 ----
{
$owners[$i]['id'] =
$this->db->f('owner_id');
! $owners[$i]['name'] =
stripslashes($this->db->f('org_name')) . ' ['. $this->db->f('category') . ']';
$i++;
}
***************
*** 184,187 ****
--- 184,190 ----
. "','" . $property['general_address'] ."','" .
$property['cat_id'] ."','" . $property['generellinfo'] ."','" .
$property['owner_id']. "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO fm_location
(location_code,type) "
+ . "VALUES ('". $property['property_id'].
"','property')",__LINE__,__FILE__);
+
$receipt['message'][]=array('msg'=>lang('Property has
been saved'));
return $receipt;
***************
*** 203,206 ****
--- 206,210 ----
{
$this->db->query("DELETE FROM fm_property WHERE
property_id='" . $property_id ."'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_location WHERE
location_code='" . $property_id ."'",__LINE__,__FILE__);
}
Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiapartment.inc.php 23 May 2003 08:40:19 -0000 1.12
--- class.uiapartment.inc.php 23 May 2003 16:24:09 -0000 1.13
***************
*** 435,443 ****
{
$location_code =
get_var('location_code',array('GET'));
- $location =
split('-',$location_code);
- $property_id = $location[0];
- $building_id = $location[1];
- $entrance_id = $location[2];
- $apartment_id = $location[3];
$confirm = get_var('confirm',array('POST'));
--- 435,438 ----
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uibuilding.inc.php 21 May 2003 20:09:51 -0000 1.20
--- class.uibuilding.inc.php 23 May 2003 16:24:09 -0000 1.21
***************
*** 394,399 ****
function delete()
{
! $property_id = get_var('property_id',array('GET'));
! $building_id =
get_var('building_id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
--- 394,398 ----
function delete()
{
! $location_code =
get_var('location_code',array('GET'));
$confirm = get_var('confirm',array('POST'));
***************
*** 405,409 ****
if (get_var('confirm',array('POST')))
{
! $this->bo->delete($property_id,$building_id);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 404,408 ----
if (get_var('confirm',array('POST')))
{
! $this->bo->delete($location_code);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
***************
*** 414,418 ****
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $property_id.'&building_id=' . $building_id),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
--- 413,417 ----
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&location_code='
. $location_code),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.7,1.8 class.soapartment.inc.php,1.4,1.5 class.sobuilding.inc.php,1.12,1.13 class.soentrance.inc.php,1.4,1.5 class.soproperty.inc.php,1.16,1.17class.uiapartment.inc.php,1.12,1.13 class.uibuilding.inc.php,1.20,1.21,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default abook_form.xsl,NONE,1.1 abook_view.xsl,NONE,1.1
- Next by Date:
[Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.21,1.22
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default abook_form.xsl,NONE,1.1 abook_view.xsl,NONE,1.1
- Next by thread:
[Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.21,1.22
- Index(es):