[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.7,1.8 class.b
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.7,1.8 class.botts.inc.php,1.14,1.15class.soadmin_location.inc.php,1.14,1.15 class.sogab.inc.php,1.11,1.12 class.sotts.inc.php,1.22,1.23 class.uigab.inc.php,1.10,1.11 class.uitts.inc.php,1.32,1.33 |
|
Date: |
Fri, 04 Jul 2003 05:56:28 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv16889/inc
Modified Files:
class.bogab.inc.php class.botts.inc.php
class.soadmin_location.inc.php class.sogab.inc.php
class.sotts.inc.php class.uigab.inc.php class.uitts.inc.php
Log Message:
no message
Index: class.bogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bogab.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.bogab.inc.php 28 Jun 2003 16:11:47 -0000 1.7
--- class.bogab.inc.php 4 Jul 2003 09:56:25 -0000 1.8
***************
*** 28,34 ****
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->so =
CreateObject($this->currentapp.'.sogab');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->solocation =
CreateObject($this->currentapp.'.solocation');
if ($session)
--- 28,45 ----
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->solocation =
CreateObject($this->currentapp.'.solocation');
+ $this->config =
CreateObject('phpgwapi.config');
+ $this->config->read_repository();
+ $gab_insert_level =
$this->config->config_data['gab_insert_level'];
+
+ if (! $gab_insert_level)
+ {
+ $gab_insert_level = 3;
+ }
+
+ $this->gab_insert_level = $gab_insert_level;
+
+ $this->so =
CreateObject($this->currentapp.'.sogab',$this->gab_insert_level);
if ($session)
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.botts.inc.php 22 Jun 2003 11:10:44 -0000 1.14
--- class.botts.inc.php 4 Jul 2003 09:56:25 -0000 1.15
***************
*** 53,57 ****
$this->send =
CreateObject('phpgwapi.send');
$this->config =
CreateObject('phpgwapi.config');
- $this->cats =
CreateObject('phpgwapi.categories');
if ($session)
--- 53,56 ----
***************
*** 244,247 ****
--- 243,251 ----
}
+ function get_category_name($cat_id)
+ {
+ return $this->so->get_category_name($cat_id);
+ }
+
function select_category_list($format='',$selected='')
{
***************
*** 302,306 ****
}
! $tickets[$i]['owner'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['owner']);
$tickets[$i]['assignedto'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['assignedto']);
--- 306,310 ----
}
! $tickets[$i]['user'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['user_id']);
$tickets[$i]['assignedto'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['assignedto']);
***************
*** 329,333 ****
$ticket = $this->so->read_single($id);
! $ticket['owner_lid'] =
$GLOBALS['phpgw']->accounts->id2name($ticket['owner_id']);
$ticket['group_lid'] =
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
--- 333,337 ----
$ticket = $this->so->read_single($id);
! $ticket['user_lid'] =
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
$ticket['group_lid'] =
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
***************
*** 391,396 ****
$ticket['status_name'] =
lang($status_text[$ticket['status']]);
$ticket['assignedto_name']=$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto']);
!
$ticket['owner_lid']=$GLOBALS['phpgw']->accounts->id2name($ticket['owner_id']);
!
$ticket['category_name']=ucfirst($this->cats->id2name($ticket['cat_id']));
return $ticket;
--- 395,400 ----
$ticket['status_name'] =
lang($status_text[$ticket['status']]);
$ticket['assignedto_name']=$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto']);
!
$ticket['user_lid']=$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
!
$ticket['category_name']=ucfirst($this->get_category_name($ticket['cat_id']));
return $ticket;
***************
*** 461,465 ****
else if ($value['status'] == 'T')
{
! $record_history[$i]['value_new_value']
= $this->cats->id2name($value['new_value']);
}
else if ($value['status'] != 'O' &&
$value['new_value'])
--- 465,469 ----
else if ($value['status'] == 'T')
{
! $record_history[$i]['value_new_value']
= $this->get_category_name($value['new_value']);
}
else if ($value['status'] != 'O' &&
$value['new_value'])
***************
*** 546,570 ****
! $prefs_owner =
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['owner_id']);
! $from_address=$prefs_owner['email']['address'];
//-----------from--------
! $user_id=$GLOBALS['phpgw_info']['user']['account_id'];
! $user_firstname =
$GLOBALS['phpgw_info']['user']['firstname'];
! $user_lastname
=$GLOBALS['phpgw_info']['user']['lastname'];
! $user_name= $user_firstname . " " .$user_lastname ;
! $prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($user_id);
! $user_address=$prefs_owner['email']['address'];
$headers = "Return-Path: <". $coordinator_email
.">\r\n";
! $headers .= "From: " . $user_name . "<" . $user_address
.">\r\n";
! $headers .= "Bcc: " . $user_name . "<" . $user_address
.">\r\n";
$headers .= "Content-type: text/html;
charset=iso-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
--- 550,574 ----
! $prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['user_id']);
! $from_address=$prefs_user['email']['address'];
//-----------from--------
!
$current_user_id=$GLOBALS['phpgw_info']['user']['account_id'];
! $current_user_firstname =
$GLOBALS['phpgw_info']['user']['firstname'];
! $current_user_lastname
=$GLOBALS['phpgw_info']['user']['lastname'];
! $current_user_name= $user_firstname . " "
.$user_lastname ;
! $current_prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($current_user_id);
!
$current_user_address=$current_prefs_user['email']['address'];
$headers = "Return-Path: <". $coordinator_email
.">\r\n";
! $headers .= "From: " . $current_user_name . "<" .
$current_user_address .">\r\n";
! $headers .= "Bcc: " . $current_user_name . "<" .
$current_user_address .">\r\n";
$headers .= "Content-type: text/html;
charset=iso-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
***************
*** 575,589 ****
$body .= lang('Ticket').' #'.$id."\n";
$body .= lang('Date Opened').': '.$timestampopened."\n";
! $body .= lang('Category').': '.
$this->cats->id2name($ticket['cat_id']) ."\n";
$body .= lang('Subject').': '. $ticket['subject'] ."\n";
! $body .= lang('Property').': '. $ticket['property_id']
."\n";
! $body .= lang('Building').': '. $ticket['building_id']
."\n";
! $body .= lang('Entrance').': '. $ticket['entrance_id']
."\n";
! $body .= lang('Apartment').': '.
$ticket['apartment_id'] ."\n";
! $body .= lang('Street').': '. $ticket['street'] ."\n";
$body .= lang('Assigned To').':
'.$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto'])."\n";
! $body .= lang('Priority').': '.$priority."\n";
// $body .= lang('Group').': '. $ticket['group_name']
."\n";
! $body .= lang('Opened By').': '. $ticket['owner_name']
."\n\n";
$body .= lang('First Note Added').":\n";
$body .=
stripslashes(strip_tags($ticket['details']))."\n\n";
--- 579,590 ----
$body .= lang('Ticket').' #'.$id."\n";
$body .= lang('Date Opened').': '.$timestampopened."\n";
! $body .= lang('Category').': '.
$this->get_category_name($ticket['cat_id']) ."\n";
$body .= lang('Subject').': '. $ticket['subject'] ."\n";
! $body .= lang('Location').': '.
$ticket['location_code'] ."\n";
! $body .= lang('Address').': '. $ticket['address'] ."\n";
$body .= lang('Assigned To').':
'.$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto'])."\n";
! $body .= lang('Priority').': '.$ticket['priority']."\n";
// $body .= lang('Group').': '. $ticket['group_name']
."\n";
! $body .= lang('Opened By').': '. $ticket['user_name']
."\n\n";
$body .= lang('First Note Added').":\n";
$body .=
stripslashes(strip_tags($ticket['details']))."\n\n";
***************
*** 625,629 ****
{
// add owner to recipients
! $members[] = array('account_id' =>
$ticket['owner_id'], 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($ticket['owner_id']));
}
--- 626,630 ----
{
// add owner to recipients
! $members[] = array('account_id' =>
$ticket['user_id'], 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']));
}
***************
*** 670,674 ****
if ($mail_method=='smtp'):
{
! $rc = $this->send->msg('email', $to, $subject,
stripslashes($body), '', $cc, $bcc,$user_address,$user_name,'txt');
}
elseif ($mail_method=='sendmail'):
--- 671,675 ----
if ($mail_method=='smtp'):
{
! $rc = $this->send->msg('email', $to, $subject,
stripslashes($body), '', $cc,
$bcc,$current_user_address,$current_user_name,'txt');
}
elseif ($mail_method=='sendmail'):
***************
*** 687,691 ****
$receipt['error'][$errorcount++] =
array('msg'=> lang('But Your message could not be sent by mail!'));
$receipt['error'][$errorcount++] =
array('msg'=> lang('The mail server returned'));
! $receipt['error'][$errorcount++] =
array('msg'=> 'From :' . $user_name . '<' . $user_address .'>');
$receipt['error'][$errorcount++] =
array('msg'=> 'to: '.$to);
$receipt['error'][$errorcount++] =
array('msg'=> 'subject: '.$ticket['subject']);
--- 688,692 ----
$receipt['error'][$errorcount++] =
array('msg'=> lang('But Your message could not be sent by mail!'));
$receipt['error'][$errorcount++] =
array('msg'=> lang('The mail server returned'));
! $receipt['error'][$errorcount++] =
array('msg'=> 'From :' . $current_user_name . '<' . $current_user_address .'>');
$receipt['error'][$errorcount++] =
array('msg'=> 'to: '.$to);
$receipt['error'][$errorcount++] =
array('msg'=> 'subject: '.$ticket['subject']);
Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.soadmin_location.inc.php 29 Jun 2003 17:07:32 -0000 1.14
--- class.soadmin_location.inc.php 4 Jul 2003 09:56:25 -0000 1.15
***************
*** 439,442 ****
--- 439,459 ----
$attrib['id'] =
$this->next_id('fm_location_type_column');
+ if($attrib['column_info']['scale'])
+ {
+ $scale="'".$attrib['column_info']['scale']."'";
+ }
+ else
+ {
+ $scale='NULL';
+ }
+ if($attrib['column_info']['default'])
+ {
+
$default="'".$attrib['column_info']['default']."'";
+ }
+ else
+ {
+ $default='NULL';
+ }
+
$this->db->transaction_begin();
***************
*** 450,457 ****
$attrib['lookup_form'] . "','" .
$attrib['list'] . "','" .
! $attrib['column_info']['type'] . "','" .
! $attrib['column_info']['precision'] . "','" .
! $attrib['column_info']['scale'] . "','" .
! $attrib['column_info']['default'] . "','" .
$attrib['column_info']['nullable'].
"')",__LINE__,__FILE__);
--- 467,474 ----
$attrib['lookup_form'] . "','" .
$attrib['list'] . "','" .
! $attrib['column_info']['type'] . "'," .
! $attrib['column_info']['precision'] . "," .
! $scale . "," .
! $default . ",'" .
$attrib['column_info']['nullable'].
"')",__LINE__,__FILE__);
***************
*** 554,557 ****
--- 571,592 ----
$OldColumnName = $this->db->f('column_name');
+ if($attrib['column_info']['scale'])
+ {
+ $scale="'".$attrib['column_info']['scale']."'";
+ }
+ else
+ {
+ $scale='NULL';
+ }
+ if($attrib['column_info']['default'])
+ {
+
$default="'".$attrib['column_info']['default']."'";
+ }
+ else
+ {
+ $default='NULL';
+ }
+
+
$this->db->query("UPDATE fm_location_type_column set
column_name = '".
$attrib['column_name'] . "',
***************
*** 563,568 ****
datatype = '".
$attrib['column_info']['type'] . "',
precision_ = '".
$attrib['column_info']['precision'] . "',
! scale = '".
$attrib['column_info']['scale'] . "',
! default_value = '".
$attrib['column_info']['default'] . "',
nullable = '".
$attrib['column_info']['nullable']
. "' WHERE id='" . $attrib['id'].
"'",__LINE__,__FILE__);
--- 598,603 ----
datatype = '".
$attrib['column_info']['type'] . "',
precision_ = '".
$attrib['column_info']['precision'] . "',
! scale = " . $scale . ",
! default_value = " . $default . ",
nullable = '".
$attrib['column_info']['nullable']
. "' WHERE id='" . $attrib['id'].
"'",__LINE__,__FILE__);
Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.sogab.inc.php 3 Jul 2003 11:50:38 -0000 1.11
--- class.sogab.inc.php 4 Jul 2003 09:56:25 -0000 1.12
***************
*** 9,15 ****
class sogab
{
! var $grants;
! function sogab()
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
--- 9,15 ----
class sogab
{
! var $gab_insert_level;
! function sogab($gab_insert_level)
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
***************
*** 19,26 ****
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->socommon =
CreateObject($this->currentapp.'.socommon');
- $this->insert_level = 3;
-
$this->join = $this->socommon->join;
}
--- 19,27 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->join = $this->socommon->join;
+
+ $this->gab_insert_level = $gab_insert_level;
+
}
***************
*** 266,274 ****
$gab_id= $gab['kommune_nr'] .
sprintf("%05s",$gab['gaards_nr']) . sprintf("%04s",$gab['bruks_nr']) .
sprintf("%04s",$gab['feste_nr']) . sprintf("%03s",$gab['seksjons_nr']);
! if($gab['propagate'] && ($next_type <
($this->insert_level+1)))
{
! // $sql = 'select location_code,loc' .
$this->insert_level . '_name as location_name FROM fm_location' .
$this->insert_level . " where location_code LIKE '%" . $gab['location_code'] .
"%'";
! $sql = 'SELECT location_code,loc' .
$this->insert_level . '_name as location_name FROM fm_location' .
$this->insert_level . " $where_condition ";
$this->db->query($sql,__LINE__,__FILE__);
--- 267,275 ----
$gab_id= $gab['kommune_nr'] .
sprintf("%05s",$gab['gaards_nr']) . sprintf("%04s",$gab['bruks_nr']) .
sprintf("%04s",$gab['feste_nr']) . sprintf("%03s",$gab['seksjons_nr']);
! if($gab['propagate'] && ($next_type <
($this->gab_insert_level+1)))
{
! // $sql = 'select location_code,loc' .
$this->gab_insert_level . '_name as location_name FROM fm_location' .
$this->gab_insert_level . " where location_code LIKE '%" .
$gab['location_code'] . "%'";
! $sql = 'SELECT location_code,loc' .
$this->gab_insert_level . '_name as location_name FROM fm_location' .
$this->gab_insert_level . " $where_condition ";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 294,298 ****
else
{
! if(count($location)==$this->insert_level)
{
$gab_insert[] = array('location_code'=>
$gab['location_code'],
--- 295,299 ----
else
{
! if(count($location)==$this->gab_insert_level)
{
$gab_insert[] = array('location_code'=>
$gab['location_code'],
***************
*** 401,405 ****
//_debug_array($gab);
! if(count($location)==$this->insert_level)
{
--- 402,406 ----
//_debug_array($gab);
! if(count($location)==$this->gab_insert_level)
{
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.sotts.inc.php 28 Jun 2003 16:11:47 -0000 1.22
--- class.sotts.inc.php 4 Jul 2003 09:56:25 -0000 1.23
***************
*** 25,28 ****
--- 25,37 ----
}
+ function get_category_name($cat_id)
+ {
+ $this->db->query("SELECT descr FROM fm_tts_category
WHERE id='$cat_id' ");
+
+ $this->db->next_record();
+
+ return stripslashes($this->db->f('descr'));
+ }
+
function select_category_list()
{
***************
*** 81,85 ****
}
! $filtermethod .= " $where ( owner= $this->account";
if (is_array($this->grants))
--- 90,94 ----
}
! $filtermethod .= " $where ( user_id= $this->account";
if (is_array($this->grants))
***************
*** 91,95 ****
}
reset($public_user_list);
! $filtermethod .= " AND owner IN(" .
implode(',',$public_user_list) . "))";
}
else
--- 100,104 ----
}
reset($public_user_list);
! $filtermethod .= " AND user_id IN(" .
implode(',',$public_user_list) . "))";
}
else
***************
*** 122,136 ****
while ($this->db->next_record())
{
- $ngrants =
(int)$this->grants[$this->db->f('owner')];
$tickets[$i]['id']
= $this->db->f('id');
$tickets[$i]['subject'] =
$this->db->f('subject');
$tickets[$i]['location_code'] =
$this->db->f('location_code');
! $tickets[$i]['owner'] =
$this->db->f('owner');
$tickets[$i]['address'] =
$this->db->f('address');
$tickets[$i]['assignedto'] =
$this->db->f('assignedto');
$tickets[$i]['status'] =
$this->db->f('status');
$tickets[$i]['priority'] =
$this->db->f('priority');
- $tickets[$i]['grants'] =
$ngrants;
$this->db2->query("select count(*) from
fm_tts_views where id='" . $this->db->f('id')
--- 131,143 ----
while ($this->db->next_record())
{
$tickets[$i]['id']
= $this->db->f('id');
$tickets[$i]['subject'] =
$this->db->f('subject');
$tickets[$i]['location_code'] =
$this->db->f('location_code');
! $tickets[$i]['user_id'] =
$this->db->f('user_id');
$tickets[$i]['address'] =
$this->db->f('address');
$tickets[$i]['assignedto'] =
$this->db->f('assignedto');
$tickets[$i]['status'] =
$this->db->f('status');
$tickets[$i]['priority'] =
$this->db->f('priority');
$this->db2->query("select count(*) from
fm_tts_views where id='" . $this->db->f('id')
***************
*** 158,162 ****
{
$ticket['assignedto'] =
$this->db->f('assignedto');
! $ticket['owner_id'] =
$this->db->f('owner');
$ticket['status'] =
$this->db->f('status');
$ticket['cat_id'] =
$this->db->f('cat_id');
--- 165,169 ----
{
$ticket['assignedto'] =
$this->db->f('assignedto');
! $ticket['user_id'] =
$this->db->f('user_id');
$ticket['status'] =
$this->db->f('status');
$ticket['cat_id'] =
$this->db->f('cat_id');
***************
*** 167,179 ****
$ticket['equipment_id'] =
$this->db->f('equipment_id');
// $ticket['contact_phone'] =
$this->db->f('contact_phone');
! $ticket['street_name'] =
$this->db->f('street_name');
! $ticket['street_number'] =
$this->db->f('street_number');
$ticket['tenant_id'] =
$this->db->f('tenant_id');
! $owner_id=(int)$this->db->f('owner');
! $this->db->query("SELECT
account_firstname,account_lastname FROM phpgw_accounts WHERE
account_id='$owner_id' ");
$this->db->next_record();
! $ticket['owner_name'] =
$this->db->f('account_firstname') . " " .$this->db->f('account_lastname') ;
}
--- 174,185 ----
$ticket['equipment_id'] =
$this->db->f('equipment_id');
// $ticket['contact_phone'] =
$this->db->f('contact_phone');
! $ticket['address'] =
$this->db->f('address');
$ticket['tenant_id'] =
$this->db->f('tenant_id');
! $user_id=(int)$this->db->f('user_id');
! $this->db->query("SELECT
account_firstname,account_lastname FROM phpgw_accounts WHERE
account_id='$user_id' ");
$this->db->next_record();
! $ticket['user_name'] =
$this->db->f('account_firstname') . " " .$this->db->f('account_lastname') ;
}
***************
*** 256,260 ****
}
! $this->db->query("insert into fm_tts_tickets
(priority,owner,"
.
"assignedto,subject,cat_id,status,details,location_code,"
. "address $cols) values ('"
--- 262,266 ----
}
! $this->db->query("insert into fm_tts_tickets
(priority,user_id,"
.
"assignedto,subject,cat_id,status,details,location_code,"
. "address $cols) values ('"
***************
*** 276,280 ****
}
! $receipt['message'][0]=array('msg'=>lang('Ticket has
been saved'));
$receipt['id'] = $id;
return $receipt;
--- 282,286 ----
}
! $receipt['message'][0]=array('msg'=>lang('Ticket %1 has
been saved',$id));
$receipt['id'] = $id;
return $receipt;
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uigab.inc.php 3 Jul 2003 11:50:38 -0000 1.10
--- class.uigab.inc.php 4 Jul 2003 09:56:25 -0000 1.11
***************
*** 54,57 ****
--- 54,58 ----
$this->status_id =
$this->bo->status_id;
$this->allrows =
$this->bo->allrows;
+ $this->gab_insert_level =
$this->bo->gab_insert_level;
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
***************
*** 528,536 ****
}
! $insert_level = 3;
!
! if((count($values['location']) < $insert_level)
&& !$values['propagate'] && !$values['location_code'])
{
! $receipt['error'][] =
array('msg'=>lang('Either select propagate - or choose the correct location
level !'));
}
--- 529,535 ----
}
! if((count($values['location']) <
$this->gab_insert_level) && !$values['propagate'] && !$values['location_code'])
{
! $receipt['error'][] =
array('msg'=>lang('Either select propagate - or choose location level %1
!',$this->gab_insert_level));
}
***************
*** 575,579 ****
else
{
! $type_id = 3;
}
$location_data=$this->bolocation->initiate_ui_location(array(
--- 574,578 ----
else
{
! $type_id = $this->gab_insert_level;
}
$location_data=$this->bolocation->initiate_ui_location(array(
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.uitts.inc.php 30 Jun 2003 10:49:14 -0000 1.32
--- class.uitts.inc.php 4 Jul 2003 09:56:25 -0000 1.33
***************
*** 104,108 ****
'address'
=> $ticket['location_data']['street_name'] . ' ' .
$ticket['location_data']['street_number'],
'date'
=> $ticket['timestampopened'],
! 'owner'
=> $ticket['owner'],
'assignedto'
=> $ticket['assignedto'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $ticket['id']),
--- 104,108 ----
'address'
=> $ticket['location_data']['street_name'] . ' ' .
$ticket['location_data']['street_number'],
'date'
=> $ticket['timestampopened'],
! 'user'
=> $ticket['user'],
'assignedto'
=> $ticket['assignedto'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $ticket['id']),
***************
*** 147,151 ****
'lang_location_code' => lang('Location
code'),
'lang_address' => lang('Address'),
! 'lang_owner' => lang('owner'),
'sort_assigned_to' =>
$this->nextmatchs->show_sort_order(array
(
--- 147,151 ----
'lang_location_code' => lang('Location
code'),
'lang_address' => lang('Address'),
! 'lang_user' => lang('user'),
'sort_assigned_to' =>
$this->nextmatchs->show_sort_order(array
(
***************
*** 162,166 ****
(
'sort' => $this->sort,
!
'var' => 'owner',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
--- 162,166 ----
(
'sort' => $this->sort,
!
'var' => 'user_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uitts.index',
***************
*** 465,468 ****
--- 465,474 ----
));
+ if ($ticket['cat_id'])
+ {
+ $this->cat_id = $ticket['cat_id'];
+ }
+
+
if($ticket['report_id'])
{
***************
*** 552,556 ****
'lang_assignedfrom'
=> lang('Assigned from'),
! 'value_assignedfrom' =>
$ticket['owner_name'],
'lang_assignedto'
=> lang('Assigned to'),
'value_assignedto'
=> $ticket['assignedto_name'],
--- 558,562 ----
'lang_assignedfrom'
=> lang('Assigned from'),
! 'value_assignedfrom' =>
$ticket['user_name'],
'lang_assignedto'
=> lang('Assigned to'),
'value_assignedto'
=> $ticket['assignedto_name'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.7,1.8 class.botts.inc.php,1.14,1.15class.soadmin_location.inc.php,1.14,1.15 class.sogab.inc.php,1.11,1.12 class.sotts.inc.php,1.22,1.23 class.uigab.inc.php,1.10,1.11 class.uitts.inc.php,1.32,1.33,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.6,1.7 class.boadmin.inc.php,1.8,1.9
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default admin_location.xsl,1.5,1.6 cat_select.xsl,1.2,1.3 config.tpl,1.10,1.11 tts.xsl,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.6,1.7 class.boadmin.inc.php,1.8,1.9
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default admin_location.xsl,1.5,1.6 cat_select.xsl,1.2,1.3 config.tpl,1.10,1.11 tts.xsl,1.9,1.10
- Index(es):