[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.12, 1.13 class
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.12, 1.13 class.soentity.inc.php, 1.13, 1.14 class.bolocation.inc.php, 1.33, 1.34 class.uitts.inc.php, 1.42, 1.43 class.soadmin_entity.inc.php, 1.13, 1.14 class.sotts.inc.php, 1.32, 1.33 class.uilocation.inc.php, 1.33, 1.34 |
|
Date: |
Mon, 10 Nov 2003 17:24:05 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv9038/inc
Modified Files:
class.uientity.inc.php class.soentity.inc.php
class.bolocation.inc.php class.uitts.inc.php
class.soadmin_entity.inc.php class.sotts.inc.php
class.uilocation.inc.php
Log Message:
no message
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** class.bolocation.inc.php 5 Nov 2003 21:15:47 -0000 1.33
--- class.bolocation.inc.php 10 Nov 2003 17:24:01 -0000 1.34
***************
*** 412,416 ****
}
! if($data['equipment'])
{
$m++;
--- 412,416 ----
}
! /* if($data['equipment'])
{
$m++;
***************
*** 440,443 ****
--- 440,444 ----
}
+ */
if (isset($data['lookup_entity']) &&
is_array($data['lookup_entity']))
{
***************
*** 489,493 ****
$GLOBALS['phpgw']->session->appsession('lookup_fields',$this->currentapp,$input_name);
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp,$insert_record);
!
$GLOBALS['phpgw']->session->appsession('input_name',$this->currentapp,$input_name);
for ($i=0;$i<count($location['location']);$i++)
--- 490,494 ----
$GLOBALS['phpgw']->session->appsession('lookup_fields',$this->currentapp,$input_name);
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp,$insert_record);
! //
$GLOBALS['phpgw']->session->appsession('input_name',$this->currentapp,$input_name);
for ($i=0;$i<count($location['location']);$i++)
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** class.sotts.inc.php 9 Nov 2003 20:25:11 -0000 1.32
--- class.sotts.inc.php 10 Nov 2003 17:24:02 -0000 1.33
***************
*** 235,238 ****
--- 235,276 ----
}
+ $sql = "SELECT * FROM fm_entity_origin WHERE
origin_id='$id' and origin ='tts' ORDER BY entity_id ASC";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $i=0;
+ $j=0;
+ $entity_id=0;
+ while ($this->db->next_record())
+ {
+ if(!$first)
+ {
+ $boadmin_entity =
CreateObject($this->currentapp.'.boadmin_entity');
+ $entity =
$boadmin_entity->read_single($this->db->f('entity_id'),false);
+ $entity_id =
$this->db->f('entity_id');
+ }
+
+ if($this->db->f('entity_id')==$entity_id)
+ {
+ $ticket['entity'][$i]['name'] =
$entity['name'];
+
$ticket['entity'][$i]['link_info'][$j]['id'] = $this->db->f('id');
+
$ticket['entity'][$i]['link_info'][$j]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$this->db->f('entity_id').'&cat_id='
. $this->db->f('cat_id'));
+ $j++;
+ }
+ else
+ {
+ $i++;
+ $j=0;
+ $entity =
$boadmin_entity->read_single($this->db->f('entity_id'),false);
+ $entity_id =
$this->db->f('entity_id');
+ $ticket['entity'][$i]['name'] =
$entity['name'];
+
$ticket['entity'][$i]['link_info'][$j]['id'] = $this->db->f('id');
+
$ticket['entity'][$i]['link_info'][$j]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$this->db->f('entity_id').'&cat_id='
. $this->db->f('cat_id'));
+ $j++;
+ }
+
+ $first=True;
+ }
+
//_debug_array($ticket);
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** class.uitts.inc.php 9 Nov 2003 20:25:11 -0000 1.42
--- class.uitts.inc.php 10 Nov 2003 17:24:01 -0000 1.43
***************
*** 433,441 ****
$additional_notes =
$this->bo->read_additional_notes($id);
$record_history = $this->bo->read_record_history($id);
- //_debug_array($values);
- //_debug_array($ticket);
- //_debug_array($additional_notes);
- //_debug_array($record_history);
-
$request_link_data = array
--- 433,436 ----
***************
*** 575,578 ****
--- 570,575 ----
'link_report'
=> $GLOBALS['phpgw']->link('/index.php',$report_lookup_data),
'value_report_id'
=> $ticket['report_id'],
+
+ 'entity_origin_list' =>
$ticket['entity'],
'lang_request'
=> lang('Request'),
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.soadmin_entity.inc.php 9 Nov 2003 20:25:11 -0000 1.13
--- class.soadmin_entity.inc.php 10 Nov 2003 17:24:02 -0000 1.14
***************
*** 438,442 ****
$fd['address'] = array('type' => 'varchar', 'precision'
=> 100, 'nullable' => True);
! $fd['status'] = array('type' => 'varchar', 'precision'
=> 20, 'nullable' => True);
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => True);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => True);
--- 438,444 ----
$fd['address'] = array('type' => 'varchar', 'precision'
=> 100, 'nullable' => True);
! $fd['tenant_id'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => True);
! $fd['contact_phone'] = array('type' => 'varchar',
'precision' => 30, 'nullable' => True);
! $fd['status'] = array('type' => 'int', 'precision' =>
4, 'nullable' => True);
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => True);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => True);
***************
*** 552,560 ****
$this->db->query("UPDATE fm_acl_location set
$value_set_acl WHERE id='.entity." . $entity['id']. "'",__LINE__,__FILE__);
!
if (isset($entity['include_entity_for']) AND
is_array($entity['include_entity_for']))
{
- $this->db->query("DELETE FROM
fm_entity_lookup WHERE type='lookup' AND entity_id=" .
$entity['id'],__LINE__,__FILE__);
-
foreach($entity['include_entity_for']
as $location)
{
--- 554,560 ----
$this->db->query("UPDATE fm_acl_location set
$value_set_acl WHERE id='.entity." . $entity['id']. "'",__LINE__,__FILE__);
! $this->db->query("DELETE FROM fm_entity_lookup
WHERE type='lookup' AND entity_id=" . $entity['id'],__LINE__,__FILE__);
if (isset($entity['include_entity_for']) AND
is_array($entity['include_entity_for']))
{
foreach($entity['include_entity_for']
as $location)
{
***************
*** 564,571 ****
}
if (isset($entity['start_entity_from']) AND
is_array($entity['start_entity_from']))
{
- $this->db->query("DELETE FROM
fm_entity_lookup WHERE type='start' AND entity_id=" .
$entity['id'],__LINE__,__FILE__);
-
foreach($entity['start_entity_from'] as
$location)
{
--- 564,571 ----
}
+ $this->db->query("DELETE FROM fm_entity_lookup
WHERE type='start' AND entity_id=" . $entity['id'],__LINE__,__FILE__);
+
if (isset($entity['start_entity_from']) AND
is_array($entity['start_entity_from']))
{
foreach($entity['start_entity_from'] as
$location)
{
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.soentity.inc.php 9 Nov 2003 20:25:11 -0000 1.13
--- class.soentity.inc.php 10 Nov 2003 17:24:01 -0000 1.14
***************
*** 376,390 ****
}
}
- }
! $sql = "SELECT * FROM fm_entity_origin WHERE entity_id
= $entity_id AND cat_id = $cat_id AND id =$id";
! $this->db->query($sql,__LINE__,__FILE__);
! $i=0;
! while ($this->db->next_record())
! {
! $entity['origin'][$i]['id'] =
$this->db->f('origin_id');
! $entity['origin'][$i]['type'] =
$this->db->f('origin');
! $i++;
}
--- 376,390 ----
}
}
! $sql = "SELECT * FROM fm_entity_origin WHERE
entity_id = $entity_id AND cat_id = $cat_id AND id =$id";
! $this->db->query($sql,__LINE__,__FILE__);
! $i=0;
! while ($this->db->next_record())
! {
! $entity['origin'][$i]['id']
= $this->db->f('origin_id');
! $entity['origin'][$i]['type'] =
$this->db->f('origin');
! $i++;
! }
}
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** class.uilocation.inc.php 28 Oct 2003 15:14:39 -0000 1.33
--- class.uilocation.inc.php 10 Nov 2003 17:24:02 -0000 1.34
***************
*** 337,341 ****
);
! $input_name =
$GLOBALS['phpgw']->session->appsession('input_name',$this->currentapp);
for ($k=0;$k<count($input_name);$k++)
--- 337,341 ----
);
! $input_name =
$GLOBALS['phpgw']->session->appsession('lookup_fields',$this->currentapp);
for ($k=0;$k<count($input_name);$k++)
***************
*** 351,354 ****
--- 351,355 ----
$function_exchange_values .='window.close()';
+ //_debug_array($input_name);
$link_excel = array
(
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** class.uientity.inc.php 9 Nov 2003 20:25:11 -0000 1.12
--- class.uientity.inc.php 10 Nov 2003 17:24:00 -0000 1.13
***************
*** 623,635 ****
}
- if(!$category)
- {
-
$category['location_level']=count(explode("-",$location_code));
- }
if($entity['location_form'])
{
$location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
! 'type_id' =>
$category['location_level'],
'no_link' =>
False, // disable lookup links for location type less than type_id
'lookup_type' => $lookup_type,
--- 623,631 ----
}
if($entity['location_form'])
{
$location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
! 'type_id' =>
-1,//$category['location_level'],
'no_link' =>
False, // disable lookup links for location type less than type_id
'lookup_type' => $lookup_type,
***************
*** 886,893 ****
--- 882,899 ----
$dateformat= (implode($sep,$dlarr));
+ if(is_array($values['origin']))
+ {
+ for ($i=0;$i<count($values['origin']);$i++)
+ {
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui'.$values['origin'][$i]['type'].'.view');
+
$values['origin'][$i]['name']=lang($values['origin'][$i]['type']);
+ }
+ }
+
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
(
+ 'origin_list'
=> $values['origin'],
'lang_entity'
=> lang('entity'),
'entity_name'
=> $entity['name'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.12, 1.13 class.soentity.inc.php, 1.13, 1.14 class.bolocation.inc.php, 1.33, 1.34 class.uitts.inc.php, 1.42, 1.43 class.soadmin_entity.inc.php, 1.13, 1.14 class.sotts.inc.php, 1.32, 1.33 class.uilocation.inc.php, 1.33, 1.34,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] api/skins/default profile.xsl,NONE,1.1.2.1
- Next by Date:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.7, 1.8 tts.xsl, 1.15, 1.16
- Previous by thread:
[Phpgroupware-cvs] api/skins/default profile.xsl,NONE,1.1.2.1
- Next by thread:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.7, 1.8 tts.xsl, 1.15, 1.16
- Index(es):