[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.15, 1.16 class
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.15, 1.16 class.botts.inc.php, 1.24, 1.25 class.sotts.inc.php, 1.34, 1.35 class.uientity.inc.php, 1.15, 1.16 class.soproject.inc.php, 1.46, 1.47 class.uilocation.inc.php, 1.34, 1.35 class.bolocation.inc.php, 1.34, 1.35 class.uirequest.inc.php, 1.31, 1.32 class.uiproject.inc.php, 1.55, 1.56 class.sorequest.inc.php, 1.21, 1.22 class.solocation.inc.php, 1.35, 1.36 |
|
Date: |
Fri, 14 Nov 2003 19:00:40 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv11081/inc
Modified Files:
class.soentity.inc.php class.botts.inc.php class.sotts.inc.php
class.uientity.inc.php class.soproject.inc.php
class.uilocation.inc.php class.bolocation.inc.php
class.uirequest.inc.php class.uiproject.inc.php
class.sorequest.inc.php class.solocation.inc.php
Log Message:
no message
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** class.uilocation.inc.php 10 Nov 2003 17:24:02 -0000 1.34
--- class.uilocation.inc.php 14 Nov 2003 19:00:38 -0000 1.35
***************
*** 55,58 ****
--- 55,60 ----
$this->part_of_town_id =
$this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
+ $this->status_drift_id =
$this->bo->status_drift_id;
+ $this->status_eco_id =
$this->bo->status_eco_id;
$this->menu->sub ='location';
***************
*** 70,74 ****
'cat_id' =>
$this->cat_id,
'part_of_town_id' =>
$this->part_of_town_id,
! 'district_id' => $this->district_id
);
$this->bo->save_sessiondata($data);
--- 72,78 ----
'cat_id' =>
$this->cat_id,
'part_of_town_id' =>
$this->part_of_town_id,
! 'district_id' => $this->district_id,
! 'status_drift_id' =>
$this->status_drift_id,
! 'status_eco_id' => $this->status_eco_id
);
$this->bo->save_sessiondata($data);
***************
*** 165,169 ****
! $location_list =
$this->bo->read($type_id,$lookup_tenant);
$end_time = $this->bo->end_time;
--- 169,173 ----
! $location_list =
$this->bo->read(array('type_id'=>$type_id,'lookup_tenant'=>$lookup_tenant,'lookup'=>$lookup));
$end_time = $this->bo->end_time;
***************
*** 255,259 ****
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
!
'cat_id'
=>$this->cat_id)
));
}
--- 259,265 ----
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
!
'cat_id'
=>$this->cat_id,
!
'status_drift_id'
=> $this->status_drift_id,
!
'status_eco_id'
=> $this->status_eco_id)
));
}
***************
*** 274,278 ****
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
!
'cat_id'
=>$this->cat_id)
));
}
--- 280,286 ----
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
!
'cat_id'
=>$this->cat_id,
!
'status_drift_id'
=> $this->status_drift_id,
!
'status_eco_id'
=> $this->status_eco_id)
));
}
***************
*** 334,338 ****
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
! 'type_id'
=>$type_id
);
--- 342,348 ----
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
! 'type_id'
=>$type_id,
! 'status_drift_id' =>
$this->status_drift_id,
! 'status_eco_id' =>
$this->status_eco_id
);
***************
*** 365,369 ****
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
! 'type_id'
=>$type_id
);
--- 375,381 ----
'lookup_tenant'
=>$lookup_tenant,
'lookup_name'
=>$lookup_name,
! 'type_id'
=>$type_id,
! 'status_drift_id' =>
$this->status_drift_id,
! 'status_eco_id' =>
$this->status_eco_id
);
***************
*** 393,396 ****
--- 405,413 ----
'lang_district_statustext' =>
lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT'),
'select_district_name' =>
'district_id',
+
+ 'status_eco_list'
=> $this->bo->get_tenant_status($this->status_eco_id,$lookup_tenant,1),
+ 'lang_no_eco'
=> lang('status eco'),
+ 'status_drift_list'
=> $this->bo->get_tenant_status($this->status_drift_id,$lookup_tenant,0),
+ 'lang_no_drift'
=> lang('status drift'),
'lang_no_cat'
=> lang('no category'),
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** class.soproject.inc.php 6 Nov 2003 18:51:02 -0000 1.46
--- class.soproject.inc.php 14 Nov 2003 19:00:38 -0000 1.47
***************
*** 530,538 ****
if($project['origin'] && $project['origin_id'])
{
! $this->db->query("INSERT INTO
fm_project_origin (origin,origin_id,project_id) "
. "VALUES ('"
. $project['origin']. "','"
. $project['origin_id']. "','"
! . $project['project_id'].
"')",__LINE__,__FILE__);
}
--- 530,539 ----
if($project['origin'] && $project['origin_id'])
{
! $this->db->query("INSERT INTO
fm_project_origin (origin,origin_id,project_id,entry_date) "
. "VALUES ('"
. $project['origin']. "','"
. $project['origin_id']. "','"
! . $project['project_id']. ","
! . time() . ")",__LINE__,__FILE__);
}
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** class.sorequest.inc.php 6 Nov 2003 18:51:02 -0000 1.21
--- class.sorequest.inc.php 14 Nov 2003 19:00:38 -0000 1.22
***************
*** 542,550 ****
if($request['origin'] && $request['origin_id'])
{
! $this->db->query("INSERT INTO
fm_request_origin (origin,origin_id,request_id) "
. "VALUES ('"
. $request['origin']. "','"
. $request['origin_id']. "','"
! . $request['request_id'].
"')",__LINE__,__FILE__);
}
--- 542,551 ----
if($request['origin'] && $request['origin_id'])
{
! $this->db->query("INSERT INTO
fm_request_origin (origin,origin_id,request_id,entry_date) "
. "VALUES ('"
. $request['origin']. "','"
. $request['origin_id']. "','"
! . $request['request_id']. ","
! . time() . ")",__LINE__,__FILE__);
}
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** class.soentity.inc.php 12 Nov 2003 18:00:51 -0000 1.15
--- class.soentity.inc.php 14 Nov 2003 19:00:37 -0000 1.16
***************
*** 504,514 ****
$this->db->transaction_begin();
! $this->db->query("INSERT INTO $table
(id,num,address,location_code,vendor_id,entry_date,user_id $cols) "
. "VALUES ("
. $values['id']. ",'"
. $num . "','"
. $address. "','"
! . $values['location_code']. "','"
! . $values['vendor_id'] . "',"
. time() . ","
. $this->account. " $vals)",__LINE__,__FILE__);
--- 504,515 ----
$this->db->transaction_begin();
!
!
! $this->db->query("INSERT INTO $table
(id,num,address,location_code,entry_date,user_id $cols) "
. "VALUES ("
. $values['id']. ",'"
. $num . "','"
. $address. "','"
! . $values['location_code']. "',"
. time() . ","
. $this->account. " $vals)",__LINE__,__FILE__);
***************
*** 516,520 ****
if($values['origin_type'] && $values['origin_id'])
{
! $this->db->query("INSERT INTO fm_entity_origin
(origin,origin_id,entity_id,cat_id,id) "
. "VALUES ('"
. $values['origin_type']. "',"
--- 517,521 ----
if($values['origin_type'] && $values['origin_id'])
{
! $this->db->query("INSERT INTO fm_entity_origin
(origin,origin_id,entity_id,cat_id,id,entry_date) "
. "VALUES ('"
. $values['origin_type']. "',"
***************
*** 522,526 ****
. $entity_id. ","
. $cat_id. ","
! . $values['id']. ")",__LINE__,__FILE__);
}
--- 523,528 ----
. $entity_id. ","
. $cat_id. ","
! . $values['id']. ","
! . time() . ")",__LINE__,__FILE__);
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** class.sotts.inc.php 12 Nov 2003 18:00:52 -0000 1.34
--- class.sotts.inc.php 14 Nov 2003 19:00:37 -0000 1.35
***************
*** 15,19 ****
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
- $this->mail =
CreateObject($this->currentapp.'.botts_mail');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
--- 15,18 ----
***************
*** 21,24 ****
--- 20,24 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->join = $this->bocommon->join;
+ $this->soadmin_entity =
CreateObject($this->currentapp.'.soadmin_entity');
}
***************
*** 178,181 ****
--- 178,182 ----
$tickets[$i]['category'] =
$this->db->f('category');
$tickets[$i]['group_id'] =
$this->db->f('group_id');
+ $tickets[$i]['entry_date'] =
$this->db->f('entry_date');
$this->db2->query("select count(*) from
fm_tts_views where id='" . $this->db->f('id')
***************
*** 194,197 ****
--- 195,253 ----
}
+ function get_origin_entity_type()
+ {
+ $sql = "SELECT fm_entity_origin.entity_id,
fm_entity_origin.cat_id,name"
+ . " FROM fm_entity_origin $this->join
fm_entity_category on fm_entity_origin.entity_id=fm_entity_category.entity_id"
+ . " AND fm_entity_origin.cat_id=fm_entity_category.id "
+ . " WHERE origin ='tts' group by
fm_entity_origin.entity_id, fm_entity_origin.cat_id,name";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $i=0;
+ while ($this->db->next_record())
+ {
+
$entity[$i]['entity_id']=$this->db->f('entity_id');
+ $entity[$i]['cat_id']=$this->db->f('cat_id');
+ // $entity[$i]['name']=$this->db->f('name');
+ $uicols[] = $this->db->f('name');
+
+ $i++;
+ }
+ $this->uicols = $uicols;
+ return $entity;
+ }
+
+ function get_child_date($id,$type,$entity_id='',$cat_id='')
+ {
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $table= 'fm_' . $type . '_origin';
+ if($cat_id)
+ {
+ $and = " AND entity_id=$entity_id AND
cat_id=$cat_id";
+ }
+
+ $sql = "SELECT * FROM $table WHERE origin_id='$id' and
origin ='tts' $and";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $date_info[$i]['entry_date']=
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$dateformat);
+ if($this->db->f('cat_id'))
+ {
+ $category =
$this->soadmin_entity->read_single_category($this->db->f('entity_id'),$this->db->f('cat_id'));
+
$date_info[$i]['type']=$category['name'];
+ }
+ else
+ {
+ $date_info[$i]['type']=lang($type);
+ }
+
+ $i++;
+ }
+ return $date_info;
+ }
+
function read_single($id)
{
***************
*** 360,364 ****
$this->db->db_addslashes($ticket['details']),
$ticket['location_code'],
! $address);
$values = $this->bocommon->validate_db_insert($values);
--- 416,421 ----
$this->db->db_addslashes($ticket['details']),
$ticket['location_code'],
! $address,
! time());
$values = $this->bocommon->validate_db_insert($values);
***************
*** 367,371 ****
$this->db->query("insert into fm_tts_tickets
(priority,user_id,"
.
"assignedto,group_id,subject,cat_id,status,details,location_code,"
! . "address $cols)"
. "VALUES ($values $vals )",__LINE__,__FILE__);
--- 424,428 ----
$this->db->query("insert into fm_tts_tickets
(priority,user_id,"
.
"assignedto,group_id,subject,cat_id,status,details,location_code,"
! . "address,entry_date $cols)"
. "VALUES ($values $vals )",__LINE__,__FILE__);
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** class.bolocation.inc.php 10 Nov 2003 17:24:01 -0000 1.34
--- class.bolocation.inc.php 14 Nov 2003 19:00:38 -0000 1.35
***************
*** 66,69 ****
--- 66,72 ----
$district_id =
get_var('district_id',array('POST','GET'));
$part_of_town_id =
get_var('part_of_town_id',array('POST','GET'));
+ $status_eco_id =
get_var('status_eco_id',array('POST','GET'));
+ $status_drift_id =
get_var('status_drift_id',array('POST','GET'));
+
if ($start)
***************
*** 104,107 ****
--- 107,118 ----
$this->district_id = $district_id;
}
+ if(isset($status_eco_id))
+ {
+ $this->status_eco_id = $status_eco_id;
+ }
+ if(isset($status_drift_id))
+ {
+ $this->status_drift_id = $status_drift_id;
+ }
}
***************
*** 118,121 ****
--- 129,134 ----
$this->part_of_town_id = $data['part_of_town_id'];
$this->district_id = $data['district_id'];
+ $this->status_eco_id = $data['status_eco_id'];
+ $this->status_drift_id = $data['status_drift_id'];
}
***************
*** 129,132 ****
--- 142,155 ----
+ function get_tenant_status($selected='',$lookup_tenant,$type='')
+ {
+ if($lookup_tenant)
+ {
+ $list= $this->so->get_tenant_status($type);
+ return
$this->bocommon->select_list($selected,$list);
+ }
+ }
+
+
function get_owner_list($format='',$selected='')
{
***************
*** 558,566 ****
! function read($type_id='',$lookup_tenant='',$allrows='')
{
$location = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'type_id' =>
$type_id,'lookup_tenant'=>$lookup_tenant,
!
'district_id'=>$this->district_id,'allrows'=>$allrows));
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
--- 581,589 ----
! function read($data='')
{
$location = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'type_id' =>
$data['type_id'],'lookup_tenant'=>$data['lookup_tenant'],'lookup'=>$data['lookup'],
!
'district_id'=>$this->district_id,'allrows'=>$data['allrows'],'status_eco_id'=>$this->status_eco_id,'status_drift_id'=>$this->status_drift_id));
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** class.uiproject.inc.php 6 Nov 2003 18:51:02 -0000 1.55
--- class.uiproject.inc.php 14 Nov 2003 19:00:38 -0000 1.56
***************
*** 555,559 ****
{
$values['ticket_id'][0]['id']=
$ticket_id;
! $values['origin']= 'ticket';
$values['origin_id']= $ticket_id;
}
--- 555,559 ----
{
$values['ticket_id'][0]['id']=
$ticket_id;
! $values['origin']= 'tts';
$values['origin_id']= $ticket_id;
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** class.solocation.inc.php 29 Sep 2003 17:53:51 -0000 1.35
--- class.solocation.inc.php 14 Nov 2003 19:00:38 -0000 1.36
***************
*** 24,27 ****
--- 24,44 ----
}
+
+ function get_tenant_status($type)
+ {
+ $sql= "SELECT * from fm_tenant_status WHERE type
='$type' ";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $status[$i]['id']
= $this->db->f('id');
+ $status[$i]['name']
= $this->db->f('id') . ' [' . stripslashes($this->db->f('descr')) .']';
+ $i++;
+ }
+ return $status;
+ }
+
+
function get_owner_type_list()
{
***************
*** 107,110 ****
--- 124,130 ----
$district_id =
(isset($data['district_id'])?$data['district_id']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
+ $status_eco_id =
(isset($data['status_eco_id'])?$data['status_eco_id']:'');
+ $status_drift_id =
(isset($data['status_drift_id'])?$data['status_drift_id']:'');
+ $lookup =
(isset($data['lookup'])?$data['lookup']:'');
}
***************
*** 115,119 ****
}
! $sql = $this->socommon->fm_cache('sql_'. $type_id . '_'
. $lookup_tenant);
if(!$sql)
--- 135,139 ----
}
! $sql = $this->socommon->fm_cache('sql_'. $type_id . '_'
. $lookup_tenant . '_' . $lookup);
if(!$sql)
***************
*** 235,240 ****
$uicols['statustext'][] =
lang('contact phone');
$sub_query_tenant=1;
!
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' .
$lookup_tenant,$sub_query_tenant);
}
--- 255,277 ----
$uicols['statustext'][] =
lang('contact phone');
+ if(!$lookup)
+ {
+ $cols.= ',fm_tenant.status_eco';
+ $cols_return[]
= 'status_eco';
+ $uicols['input_type'][]
= 'text';
+ $uicols['name'][]
= 'status_eco';
+ $uicols['descr'][]
= lang('status eco');
+ $uicols['statustext'][]
= lang('status eco');
+
+ $cols.=
',fm_tenant.status_drift';
+ $cols_return[]
= 'status_drift';
+ $uicols['input_type'][]
= 'text';
+ $uicols['name'][]
= 'status_drift';
+ $uicols['descr'][]
= lang('status drift');
+ $uicols['statustext'][]
= lang('status drift');
+ }
+
$sub_query_tenant=1;
!
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' . $lookup_tenant
. '_' . $lookup,$sub_query_tenant);
}
***************
*** 261,265 ****
$sub_query_street=1;
!
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' .
$lookup_tenant,$sub_query_street);
$cols.=
',fm_streetaddress.descr as street_name';
--- 298,302 ----
$sub_query_street=1;
!
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' . $lookup_tenant
. '_' . $lookup,$sub_query_street);
$cols.=
',fm_streetaddress.descr as street_name';
***************
*** 300,315 ****
$sql = "SELECT $cols $from $joinmethod";
! $this->socommon->fm_cache('sql_'. $type_id .
'_' . $lookup_tenant ,$sql);
! $this->socommon->fm_cache('uicols_'. $type_id
. '_' . $lookup_tenant,$uicols);
! $this->socommon->fm_cache('cols_return_'.
$type_id . '_' . $lookup_tenant,$cols_return);
}
else
{
! $uicols = $this->socommon->fm_cache('uicols_'.
$type_id . '_' . $lookup_tenant);
! $cols_return =
$this->socommon->fm_cache('cols_return_'. $type_id . '_' . $lookup_tenant);
! $sub_query_tenant =
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' .
$lookup_tenant);
! $sub_query_street =
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' .
$lookup_tenant);
}
--- 337,352 ----
$sql = "SELECT $cols $from $joinmethod";
! $this->socommon->fm_cache('sql_'. $type_id .
'_' . $lookup_tenant . '_' . $lookup ,$sql);
! $this->socommon->fm_cache('uicols_'. $type_id
. '_' . $lookup_tenant . '_' . $lookup,$uicols);
! $this->socommon->fm_cache('cols_return_'.
$type_id . '_' . $lookup_tenant . '_' . $lookup,$cols_return);
}
else
{
! $uicols = $this->socommon->fm_cache('uicols_'.
$type_id . '_' . $lookup_tenant . '_' . $lookup);
! $cols_return =
$this->socommon->fm_cache('cols_return_'. $type_id . '_' . $lookup_tenant .
'_' . $lookup);
! $sub_query_tenant =
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' . $lookup_tenant
. '_' . $lookup);
! $sub_query_street =
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' . $lookup_tenant
. '_' . $lookup);
}
***************
*** 361,364 ****
--- 398,424 ----
$querymethod = " AND (fm_location" .
($type_id).".loc1 LIKE '%$query%' $sub_query OR fm_location" .
($type_id).".location_code LIKE '%$query%' OR loc" . ($type_id)."_name LIKE
'%$query%')";
}
+
+ if ($status_eco_id > 0)
+ {
+ $filtermethod .= " AND
(fm_tenant.status_eco=$status_eco_id ";
+ $and='OR';
+ }
+ else
+ {
+ $and='AND (';
+ }
+
+ if ($status_drift_id > 0)
+ {
+ $filtermethod .= " $and
fm_tenant.status_eco=$status_drift_id ) ";
+ }
+ else
+ {
+ if ($status_eco_id > 0)
+ {
+ $filtermethod .= ')';
+ }
+ }
+
$sql .= "$filtermethod $querymethod";
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** class.uirequest.inc.php 6 Nov 2003 18:51:02 -0000 1.31
--- class.uirequest.inc.php 14 Nov 2003 19:00:38 -0000 1.32
***************
*** 482,486 ****
if($ticket_id)
{
! $values['origin']= 'ticket';
$values['origin_id']= $ticket_id;
}
--- 482,486 ----
if($ticket_id)
{
! $values['origin']= 'tts';
$values['origin_id']= $ticket_id;
}
***************
*** 641,645 ****
! if($values['origin']== 'ticket')
{
$origin_data = array
--- 641,645 ----
! if($values['origin']== 'tts')
{
$origin_data = array
***************
*** 1006,1010 ****
! if($values['origin']== 'ticket')
{
$origin_data = array
--- 1006,1010 ----
! if($values['origin']== 'tts')
{
$origin_data = array
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** class.uientity.inc.php 12 Nov 2003 18:00:51 -0000 1.15
--- class.uientity.inc.php 14 Nov 2003 19:00:37 -0000 1.16
***************
*** 70,74 ****
$this->fakebase =
$this->bo->fakebase;
$this->category_name =
$this->bo->category_name;
-
$this->menu->sub
='entity_'.$this->entity_id;
$GLOBALS['phpgw']->session->appsession('entity_id',$this->currentapp,$this->entity_id);
--- 70,73 ----
***************
*** 592,597 ****
}
- $receipt = $this->bo->create_home_dir();
-
//_debug_array($values);
if ($values['save'])
--- 591,594 ----
***************
*** 635,642 ****
--- 632,642 ----
$id = $values['id'];
$function_msg = lang('edit entity');
+ $receipt[] =
$this->bo->create_home_dir();
if($values['file_name'])
{
$this->bo->create_document_dir($values['location']['loc1'], $values['id']);
+ $this->bo->vfs->override_acl =
1;
+
if(!$this->bo->vfs->cp (array (
'from' =>
$_FILES['file']['tmp_name'],
***************
*** 646,649 ****
--- 646,650 ----
$receipt['error'][]=array('msg'=>lang('Failed to upload file !'));
}
+ $this->bo->vfs->override_acl =
0;
}
}
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** class.botts.inc.php 12 Nov 2003 18:00:52 -0000 1.24
--- class.botts.inc.php 14 Nov 2003 19:00:37 -0000 1.25
***************
*** 310,313 ****
--- 310,317 ----
$this->total_records = $this->so->total_records;
+ $entity = $this->so->get_origin_entity_type();
+ $this->uicols = $this->so->uicols;
+
+ _debug_array($this->uicols);
for ($i=0; $i<count($tickets); $i++)
{
***************
*** 321,326 ****
}
! $history_values =
$this->historylog->return_array(array(),array('O'),'history_timestamp','DESC',$tickets[$i]['id']);
! $tickets[$i]['timestampopened'] =
$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'],$dateformat);
if ($tickets[$i]['status'] == 'X')
--- 325,329 ----
}
! $tickets[$i]['timestampopened'] =
$GLOBALS['phpgw']->common->show_date($tickets[$i]['entry_date'],$dateformat);
if ($tickets[$i]['status'] == 'X')
***************
*** 333,338 ****
$tickets[$i]['new_ticket'] =
lang('New');
}
}
! //_debug_array($tickets);
return $tickets;
}
--- 336,352 ----
$tickets[$i]['new_ticket'] =
lang('New');
}
+
+ $tickets[$i]['project_date'] =
$this->so->get_child_date($tickets[$i]['id'],'project');
+
+ for ($j=0;$j<count($entity);$j++)
+ {
+
$tickets[$i]['entity_date_'.$entity[$j]['entity_id'].'_'.$entity[$j]['cat_id']]
=
$this->so->get_child_date($tickets[$i]['id'],'entity',$entity[$j]['entity_id'],$entity[$j]['cat_id']);
+ }
+
}
!
! $this->uicols[] = lang('project');
!
! _debug_array($tickets);
return $tickets;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.15, 1.16 class.botts.inc.php, 1.24, 1.25 class.sotts.inc.php, 1.34, 1.35 class.uientity.inc.php, 1.15, 1.16 class.soproject.inc.php, 1.46, 1.47 class.uilocation.inc.php, 1.34, 1.35 class.bolocation.inc.php, 1.34, 1.35 class.uirequest.inc.php, 1.31, 1.32 class.uiproject.inc.php, 1.55, 1.56 class.sorequest.inc.php, 1.21, 1.22 class.solocation.inc.php, 1.35, 1.36,
Sigurd Nes <address@hidden> <=