[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.4, 1.5 class.u
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.4, 1.5 class.uientity.inc.php, 1.2, 1.3 class.soadmin_entity.inc.php, 1.6, 1.7 class.boentity.inc.php, 1.2, 1.3 class.bocommon.inc.php, 1.86, 1.87 class.uiadmin_entity.inc.php, 1.5, 1.6 class.boadmin_entity.inc.php, 1.3, 1.4 class.uitts.inc.php, 1.39, 1.40 |
|
Date: |
Thu, 23 Oct 2003 16:52:17 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv2747/inc
Modified Files:
class.soentity.inc.php class.uientity.inc.php
class.soadmin_entity.inc.php class.boentity.inc.php
class.bocommon.inc.php class.uiadmin_entity.inc.php
class.boadmin_entity.inc.php class.uitts.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** class.bocommon.inc.php 18 Oct 2003 22:15:51 -0000 1.86
--- class.bocommon.inc.php 23 Oct 2003 16:52:14 -0000 1.87
***************
*** 495,498 ****
--- 495,499 ----
'R' => 'radio',
'CH' => 'checkbox',
+ 'LB' => 'listbox'
);
***************
*** 516,520 ****
$attributes_values[$i]['value'] =
$GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($attributes_values[$i]['datatype']=='R' ||
$attributes_values[$i]['datatype']=='CH')
{
$attributes_values[$i]['choice']
=
$sostandard_entity->read_attrib_choice($attributes_values[$i]['attrib_id'],$data['type']);
--- 517,521 ----
$attributes_values[$i]['value'] =
$GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($attributes_values[$i]['datatype']=='R' ||
$attributes_values[$i]['datatype']=='CH' ||
$attributes_values[$i]['datatype']=='LB')
{
$attributes_values[$i]['choice']
=
$sostandard_entity->read_attrib_choice($attributes_values[$i]['attrib_id'],$data['type']);
***************
*** 594,597 ****
--- 595,599 ----
'R' => 'Muliple radio',
'CH' => 'Muliple checkbox',
+ 'LB' => 'Listbox'
);
***************
*** 612,615 ****
--- 614,618 ----
'R' => 'int',
'CH' => 'text',
+ 'LB' => 'int'
);
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** class.uitts.inc.php 10 Oct 2003 21:57:14 -0000 1.39
--- class.uitts.inc.php 23 Oct 2003 16:52:15 -0000 1.40
***************
*** 306,310 ****
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
! header('Location: '.
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&order=id&sort=DESC'));
}
else
--- 306,310 ----
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
! header('Location: '.
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index'));
}
else
Index: class.boadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin_entity.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.boadmin_entity.inc.php 19 Oct 2003 12:22:34 -0000 1.3
--- class.boadmin_entity.inc.php 23 Oct 2003 16:52:15 -0000 1.4
***************
*** 333,336 ****
--- 333,338 ----
$datatypes[7]['id']= 'CH';
$datatypes[7]['name']= lang('Multiple Checkbox');
+ $datatypes[8]['id']= 'LB';
+ $datatypes[8]['name']= lang('ListBox');
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.soentity.inc.php 22 Oct 2003 17:01:09 -0000 1.4
--- class.soentity.inc.php 23 Oct 2003 16:52:14 -0000 1.5
***************
*** 28,33 ****
return;
}
! $table = 'fm_entity_'. $entity_id .'_'.$cat_id .
'_status';
! $this->db->query("SELECT id, descr FROM $table ORDER BY
id ");
$i = 0;
--- 28,42 ----
return;
}
!
! $sql= "SELECT fm_entity_choice.id,
fm_entity_choice.value FROM fm_entity_attribute $this->join fm_entity_choice ON
"
! . " fm_entity_attribute.entity_id=
fm_entity_choice.entity_id AND "
! . " fm_entity_attribute.cat_id= fm_entity_choice.cat_id
AND "
! . " fm_entity_attribute.id= fm_entity_choice.attrib_id "
! . " WHERE fm_entity_attribute.column_name='status' "
! . " AND fm_entity_choice.entity_id=$entity_id "
! . " AND fm_entity_choice.cat_id=$cat_id ORDER BY
fm_entity_choice.id";
!
!
! $this->db->query($sql,__LINE__,__FILE__);
$i = 0;
***************
*** 35,39 ****
{
$status[$i]['id']
= $this->db->f('id');
! $status[$i]['name']
= stripslashes($this->db->f('descr'));
$i++;
}
--- 44,48 ----
{
$status[$i]['id']
= $this->db->f('id');
! $status[$i]['name']
= stripslashes($this->db->f('value'));
$i++;
}
***************
*** 41,61 ****
}
- function get_filter_list($cat_id='')
- {
- $sql = "SELECT id ,name FROM fm_equipment_type_attrib
where type_id = '$cat_id' ORDER BY name DESC";
-
- $this->db->query($sql .
$ordermethod,$start,__LINE__,__FILE__);
-
- while ($this->db->next_record())
- {
- $filter_list[] = array
- (
- 'id' => $this->db->f('id'),
- 'name' => $this->db->f('name'),
- );
- }
-
- return $filter_list;
- }
function read($data)
--- 50,53 ----
***************
*** 245,249 ****
$value=$this->db->f($cols_return_extra[$i]['name']);
!
if($cols_return_extra[$i]['datatype']=='R' && $value):
{
$sql="SELECT value FROM
fm_entity_choice where entity_id=$entity_id AND cat_id=$cat_id AND attrib_id="
.$cols_return_extra[$i]['attrib_id']. " AND id=" . $value;
--- 237,241 ----
$value=$this->db->f($cols_return_extra[$i]['name']);
!
if(($cols_return_extra[$i]['datatype']=='R' ||
$cols_return_extra[$i]['datatype']=='LB') && $value):
{
$sql="SELECT value FROM
fm_entity_choice where entity_id=$entity_id AND cat_id=$cat_id AND attrib_id="
.$cols_return_extra[$i]['attrib_id']. " AND id=" . $value;
***************
*** 441,445 ****
$num=$this->generate_num($entity_id,$cat_id,$values['id']);
! $this->db->query("INSERT INTO $table
(id,num,address,location_code,status,vendor_id,entry_date,user_id $cols) "
. "VALUES ("
. $values['id']. ",'"
--- 433,437 ----
$num=$this->generate_num($entity_id,$cat_id,$values['id']);
! $this->db->query("INSERT INTO $table
(id,num,address,location_code,vendor_id,entry_date,user_id $cols) "
. "VALUES ("
. $values['id']. ",'"
***************
*** 447,451 ****
. $address. "','"
. $values['location_code']. "','"
- . $values['status']. "','"
. $values['vendor_id'] . "',"
. time() . ","
--- 439,442 ----
***************
*** 476,480 ****
$value_set=array(
'location_code' => $values['location_code'],
- 'status' => $values['status'],
'address' => $address,
'vendor_id' => $values['vendor_id']
--- 467,470 ----
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** class.soadmin_entity.inc.php 22 Oct 2003 17:01:09 -0000 1.6
--- class.soadmin_entity.inc.php 23 Oct 2003 16:52:14 -0000 1.7
***************
*** 393,410 ****
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => True);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => True);
- // $fd['remark'] = array('type' => 'text', 'nullable' =>
True);
$pk[]= 'id';
!
$fd_status['id'] = array('type' => 'varchar',
'precision' => 20, 'nullable' => False);
$fd_status['descr'] = array('type' => 'varchar',
'precision' => 255, 'nullable' => False);
$pk_status[]= 'id';
- $table = 'fm_entity_'.
$values['entity_id'] .'_'.$values['id'];
$statustable = $table . '_' .'status';
!
! if(($this->oProc->CreateTable($table,array('fd' =>
$fd,'pk' => $pk,'fk' => $fk,'ix' => array('location_code'),'uc' => array())))
! &&
($this->oProc->CreateTable($statustable,array('fd' => $fd_status,'pk' =>
$pk_status,'fk' => $fk_status,'ix' => False,'uc' => array()))))
{
$receipt['message'][] = array('msg' =>
lang('table %1 has been saved',$table));
$this->db->transaction_commit();
--- 393,427 ----
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => True);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => True);
$pk[]= 'id';
! $table = 'fm_entity_'.
$values['entity_id'] .'_'.$values['id'];
! /*
$fd_status['id'] = array('type' => 'varchar',
'precision' => 20, 'nullable' => False);
$fd_status['descr'] = array('type' => 'varchar',
'precision' => 255, 'nullable' => False);
$pk_status[]= 'id';
$statustable = $table . '_' .'status';
! */
! if(($this->oProc->CreateTable($table,array('fd' =>
$fd,'pk' => $pk,'fk' => $fk,'ix' => array('location_code'),'uc' => array()))))
! // &&
($this->oProc->CreateTable($statustable,array('fd' => $fd_status,'pk' =>
$pk_status,'fk' => $fk_status,'ix' => False,'uc' => array()))))
{
+
+ $values_insert= array(
+ $values['entity_id'],
+ $values['id'],
+ 1,
+ 'status',
+ 'Status',
+ 'Status',
+ 'LB',
+ 1,
+ 'True'
+ );
+
+ $values_insert =
$this->bocommon->validate_db_insert($values_insert);
+
+ $this->db->query("INSERT INTO
fm_entity_attribute
(entity_id,cat_id,id,column_name,input_text,statustext,datatype,attrib_sort,nullable)
"
+ . "VALUES
($values_insert)",__LINE__,__FILE__);
+
$receipt['message'][] = array('msg' =>
lang('table %1 has been saved',$table));
$this->db->transaction_commit();
***************
*** 539,543 ****
$this->init_process();
$this->oProc->DropTable('fm_entity_' . $entity_id . '_'
. $id);
! $this->oProc->DropTable('fm_entity_' . $entity_id . '_'
. $id . '_' . 'status');
$this->db->query("DELETE FROM fm_entity_category WHERE
entity_id= $entity_id AND id= $id",__LINE__,__FILE__);
}
--- 556,560 ----
$this->init_process();
$this->oProc->DropTable('fm_entity_' . $entity_id . '_'
. $id);
! // $this->oProc->DropTable('fm_entity_' . $entity_id . '_'
. $id . '_' . 'status');
$this->db->query("DELETE FROM fm_entity_category WHERE
entity_id= $entity_id AND id= $id",__LINE__,__FILE__);
}
***************
*** 677,681 ****
$attrib['lookup_form']
= $this->db->f('lookup_form');
$attrib['list']
= $this->db->f('list');
! if($this->db->f('datatype')=='R' ||
$this->db->f('datatype')=='CH')
{
$attrib['choice'] =
$this->read_attrib_choice($entity_id,$cat_id,$id);
--- 694,698 ----
$attrib['lookup_form']
= $this->db->f('lookup_form');
$attrib['list']
= $this->db->f('list');
! if($this->db->f('datatype')=='R' ||
$this->db->f('datatype')=='CH' || $this->db->f('datatype')=='LB')
{
$attrib['choice'] =
$this->read_attrib_choice($entity_id,$cat_id,$id);
***************
*** 841,845 ****
}
! if($attrib['column_info']['type']!='R' &&
$attrib['column_info']['type']!='CH')
{
$this->db->query("DELETE FROM $choice_table
WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" . $attrib['cat_id']. "
AND attrib_id=" . $attrib['id'],__LINE__,__FILE__);
--- 858,862 ----
}
! if($attrib['column_info']['type']!='R' &&
$attrib['column_info']['type']!='CH' && $attrib['column_info']['type']!='LB')
{
$this->db->query("DELETE FROM $choice_table
WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" . $attrib['cat_id']. "
AND attrib_id=" . $attrib['id'],__LINE__,__FILE__);
Index: class.boentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.boentity.inc.php 22 Oct 2003 17:01:09 -0000 1.2
--- class.boentity.inc.php 23 Oct 2003 16:52:14 -0000 1.3
***************
*** 238,277 ****
}
- function filter($selected='')
- {
-
-
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
-
- if($this->cat_id)
- {
- $filters=
$this->so->get_filter_list($this->cat_id);
- }
-
- while (is_array($filters) && list(,$filter) =
each($filters))
- {
- $sel_filter = '';
- if ($filter['id']==$selected)
- {
- $sel_filter = 'selected';
- }
-
- $filter_list[] = array
- (
- 'id' => $filter['id'],
- 'name' => $filter['name'],
- 'selected' => $sel_filter
- );
- }
-
- for ($i=0;$i<count($filter_list);$i++)
- {
- if ($filter_list[$i]['selected'] != 'selected')
- {
- unset($filter_list[$i]['selected']);
- }
- }
-
- return $filter_list;
- }
function read($data='')
--- 238,241 ----
***************
*** 323,326 ****
--- 287,291 ----
'R' => 'radio',
'CH' => 'checkbox',
+ 'LB' => 'listbox'
);
***************
*** 340,344 ****
$entity['attributes'][$i]['value']
= $GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($entity['attributes'][$i]['datatype']=='R'
|| $entity['attributes'][$i]['datatype']=='CH')
{
$entity['attributes'][$i]['choice']
=
$soadmin_entity->read_attrib_choice($data['entity_id'],$data['cat_id'],$entity['attributes'][$i]['attrib_id']);
--- 305,309 ----
$entity['attributes'][$i]['value']
= $GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($entity['attributes'][$i]['datatype']=='R'
|| $entity['attributes'][$i]['datatype']=='CH' ||
$entity['attributes'][$i]['datatype']=='LB')
{
$entity['attributes'][$i]['choice']
=
$soadmin_entity->read_attrib_choice($data['entity_id'],$data['cat_id'],$entity['attributes'][$i]['attrib_id']);
***************
*** 436,439 ****
--- 401,405 ----
}
+ /*
function read_attibutes($data)
{
***************
*** 453,456 ****
--- 419,423 ----
'R' => 'radio',
'CH' => 'checkbox',
+ 'LB' => 'listbox',
);
***************
*** 474,478 ****
$attributes_values[$i]['value'] =
$GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($attributes_values[$i]['datatype']=='R' ||
$attributes_values[$i]['datatype']=='CH')
{
$attributes_values[$i]['choice']
=
$soadmin_entity->read_attrib_choice($data['entity_id'],$data['cat_id'],$attributes_values[$i]['attrib_id']);
--- 441,445 ----
$attributes_values[$i]['value'] =
$GLOBALS['phpgw']->common->show_date($timestamp_date,$dateformat);
}
! if($attributes_values[$i]['datatype']=='R' ||
$attributes_values[$i]['datatype']=='CH' ||
$attributes_values[$i]['datatype']=='LB')
{
$attributes_values[$i]['choice']
=
$soadmin_entity->read_attrib_choice($data['entity_id'],$data['cat_id'],$attributes_values[$i]['attrib_id']);
***************
*** 506,510 ****
return $attributes_values;
}
!
}
--- 473,477 ----
return $attributes_values;
}
! */
}
Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.uiadmin_entity.inc.php 22 Oct 2003 17:01:09 -0000 1.5
--- class.uiadmin_entity.inc.php 23 Oct 2003 16:52:15 -0000 1.6
***************
*** 324,328 ****
'prefix'
=> $entry['prefix'],
'descr'
=> $entry['descr'],
! 'link_status'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_status&cat_id='
. $entry['id'] . '&entity_id=' . $entity_id),
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&cat_id='
. $entry['id'] . '&entity_id=' . $entity_id),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.edit_category&id='
. $entry['id'] . '&entity_id=' . $entity_id),
--- 324,328 ----
'prefix'
=> $entry['prefix'],
'descr'
=> $entry['descr'],
! // 'link_status'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_status&cat_id='
. $entry['id'] . '&entity_id=' . $entity_id),
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&cat_id='
. $entry['id'] . '&entity_id=' . $entity_id),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.edit_category&id='
. $entry['id'] . '&entity_id=' . $entity_id),
***************
*** 348,352 ****
'lang_descr' => lang('Descr'),
'lang_prefix' => lang('prefix'),
! 'lang_status' => lang('Status'),
'lang_attribute' => lang('Attributes'),
'lang_edit' => lang('edit'),
--- 348,352 ----
'lang_descr' => lang('Descr'),
'lang_prefix' => lang('prefix'),
! // 'lang_status' => lang('Status'),
'lang_attribute' => lang('Attributes'),
'lang_edit' => lang('edit'),
***************
*** 840,845 ****
'input_text'
=> $entry['input_text'],
'sorting'
=> $entry['attrib_sort'],
! 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&resort=up&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id']),
! 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&resort=down&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.edit_attrib&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.delete&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&attrib_id=' . $entry['id']),
--- 840,845 ----
'input_text'
=> $entry['input_text'],
'sorting'
=> $entry['attrib_sort'],
! 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&resort=up&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id'] . '&allrows=' .
$this->allrows),
! 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.list_attribute&resort=down&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id'] . '&allrows=' .
$this->allrows),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.edit_attrib&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&id=' . $entry['id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_entity.delete&entity_id='
. $entity_id . '&cat_id=' . $cat_id . '&attrib_id=' . $entry['id']),
***************
*** 1051,1055 ****
);
! if($values['column_info']['type']=='R' ||
$values['column_info']['type']=='CH')
{
$multiple_choice= True;
--- 1051,1055 ----
);
! if($values['column_info']['type']=='R' ||
$values['column_info']['type']=='CH' || $values['column_info']['type']=='LB')
{
$multiple_choice= True;
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.uientity.inc.php 22 Oct 2003 17:01:09 -0000 1.2
--- class.uientity.inc.php 23 Oct 2003 16:52:14 -0000 1.3
***************
*** 456,460 ****
}
-
if(!$this->entity_id || !$this->cat_id)
{
--- 456,459 ----
***************
*** 602,607 ****
'type_id' => -1,
// calculated from location_types
'no_link' =>
False, // disable lookup links for location type less than type_id
- // 'tenant' => True,
- // 'entity' => True,
'lookup_type' => $lookup_type
));
--- 601,604 ----
***************
*** 691,695 ****
'attributes_values'
=> $attributes_values,
'dateformat'
=> $dateformat,
!
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
--- 688,692 ----
'attributes_values'
=> $attributes_values,
'dateformat'
=> $dateformat,
! 'lang_none'
=> lang('None'),
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
***************
*** 704,717 ****
'error_flag'
=> $error_id,
'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Save the entity'),
! 'status_list'
=> $this->bo->select_status_list('select',$values['status']),
! 'select_status_name' =>
'values[status]',
! 'lang_no_status'
=> lang('Select status'),
! 'lang_status'
=> lang('Status'),
! 'lang_status_statustext' =>
lang('What is the current status of this entity ?')
);
$appname = $entity['name'];
!
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
--- 701,709 ----
'error_flag'
=> $error_id,
'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Save the entity')
);
$appname = $entity['name'];
! //_debug_array($attributes_values);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
***************
*** 788,795 ****
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
! 'type_id' => -1,
// calculated from location_types
'no_link' =>
False, // disable lookup links for location type less than type_id
- // 'tenant' => True,
- // 'entity' => True,
'lookup_type' => $lookup_type
));
--- 780,785 ----
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
! 'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
'no_link' =>
False, // disable lookup links for location type less than type_id
'lookup_type' => $lookup_type
));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.4, 1.5 class.uientity.inc.php, 1.2, 1.3 class.soadmin_entity.inc.php, 1.6, 1.7 class.boentity.inc.php, 1.2, 1.3 class.bocommon.inc.php, 1.86, 1.87 class.uiadmin_entity.inc.php, 1.5, 1.6 class.boadmin_entity.inc.php, 1.3, 1.4 class.uitts.inc.php, 1.39, 1.40,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.2, 1.3 admin_entity.xsl, 1.4, 1.5
- Next by Date:
[Phpgroupware-cvs] api class.msgbox.php, 1.1.1.1, 1.1.1.1.2.1 class.setup.php, 1.1.1.1, 1.1.1.1.2.1 core_functions.inc.php, 1.1.1.1, 1.1.1.1.2.1
- Previous by thread:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.2, 1.3 admin_entity.xsl, 1.4, 1.5
- Next by thread:
[Phpgroupware-cvs] api class.msgbox.php, 1.1.1.1, 1.1.1.1.2.1 class.setup.php, 1.1.1.1, 1.1.1.1.2.1 core_functions.inc.php, 1.1.1.1, 1.1.1.1.2.1
- Index(es):