[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.87, 1.88 class
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.87, 1.88 class.uiadmin_entity.inc.php, 1.6, 1.7 class.uientity.inc.php, 1.3, 1.4 class.soentity.inc.php, 1.5, 1.6 class.soadmin_entity.inc.php, 1.7, 1.8 class.boadmin_entity.inc.php, 1.4, 1.5 |
Date: |
Sun, 26 Oct 2003 20:33:03 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13774/inc
Modified Files:
class.bocommon.inc.php class.uiadmin_entity.inc.php
class.uientity.inc.php class.soentity.inc.php
class.soadmin_entity.inc.php class.boadmin_entity.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.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** class.bocommon.inc.php 23 Oct 2003 16:52:14 -0000 1.87
--- class.bocommon.inc.php 26 Oct 2003 20:33:01 -0000 1.88
***************
*** 222,225 ****
--- 222,256 ----
+
+ function select_list($selected='',$input_list='')
+ {
+ if (isset($input_list) AND is_array($input_list))
+ {
+ foreach($input_list as $entry)
+ {
+ $sel_entry = '';
+ if ($entry['id']==$selected)
+ {
+ $sel_entry = 'selected';
+ }
+ $entry_list[] = array
+ (
+ 'id' => $entry['id'],
+ 'name' =>
$entry['name'],
+ 'selected' => $sel_entry
+ );
+ }
+ for ($i=0;$i<count($entry_list);$i++)
+ {
+ if ($entry_list[$i]['selected'] !=
'selected')
+ {
+
unset($entry_list[$i]['selected']);
+ }
+ }
+ }
+ return $entry_list;
+ }
+
+
function
get_user_list($format='',$selected='',$extra='',$default='')
{
***************
*** 1015,1018 ****
--- 1046,1050 ----
$paranthesis =
(isset($data['paranthesis'])?$data['paranthesis']:'');
$lookup =
(isset($data['lookup'])?$data['lookup']:'');
+ $location_level =
(isset($data['location_level'])?$data['location_level']:'');
$this->join = $this->socommon->join;
***************
*** 1030,1034 ****
! $type_id = count($location_types);
$this->type_id = $type_id;
--- 1062,1073 ----
! if($location_level)
! {
! $type_id=$location_level;
! }
! else
! {
! $type_id = count($location_types);
! }
$this->type_id = $type_id;
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.soadmin_entity.inc.php 23 Oct 2003 16:52:14 -0000 1.7
--- class.soadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.8
***************
*** 255,258 ****
--- 255,259 ----
$category['prefix'] =
$this->db->f('prefix');
$category['lookup_vendor'] =
$this->db->f('lookup_vendor');
+ $category['location_level'] =
$this->db->f('location_level');
return $category;
***************
*** 363,367 ****
$values['descr'],
$values['prefix'],
! $values['lookup_vendor']
);
--- 364,369 ----
$values['descr'],
$values['prefix'],
! $values['lookup_vendor'],
! $values['location_level'],
);
***************
*** 371,375 ****
$this->db->transaction_begin();
! $this->db->query("INSERT INTO fm_entity_category
(entity_id,id,name, descr,prefix,lookup_vendor) "
. "VALUES ($values_insert)",__LINE__,__FILE__);
--- 373,377 ----
$this->db->transaction_begin();
! $this->db->query("INSERT INTO fm_entity_category
(entity_id,id,name, descr,prefix,lookup_vendor,location_level) "
. "VALUES ($values_insert)",__LINE__,__FILE__);
***************
*** 518,522 ****
'name' =>
$entity['name'],
'prefix' =>
$entity['prefix'],
! 'lookup_vendor' =>
$entity['lookup_vendor']
);
--- 520,525 ----
'name' =>
$entity['name'],
'prefix' =>
$entity['prefix'],
! 'lookup_vendor' =>
$entity['lookup_vendor'],
! 'location_level'=>
$entity['location_level']
);
Index: class.boadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin_entity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.boadmin_entity.inc.php 23 Oct 2003 16:52:15 -0000 1.4
--- class.boadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.5
***************
*** 135,138 ****
--- 135,154 ----
+ function get_location_level_list($selected='')
+ {
+
+ $location_types =
$this->bocommon->soadmin_location->select_location_type();
+ $max_location_type=count($location_types);
+
+ for ($i=1; $i<=$max_location_type; $i++)
+ {
+ $location[$i][id] = $i;
+ $location[$i][name] = $i;
+ }
+
+ return
$this->bocommon->select_list($selected,$location);
+
+ }
+
function read()
{
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.soentity.inc.php 23 Oct 2003 16:52:14 -0000 1.5
--- class.soentity.inc.php 26 Oct 2003 20:33:01 -0000 1.6
***************
*** 101,106 ****
$uicols['statustext'][] = false;
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols_return'=>$cols_return,'cols'=>$cols,
!
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query,'lookup'=>$lookup));
$this->bocommon->fm_cache('sql_entity_' .
$entity_id . '_' . $cat_id,$sql);
--- 101,109 ----
$uicols['statustext'][] = false;
+ $admin_entity =
CreateObject($this->currentapp.'.soadmin_entity');
+ $category =
$admin_entity->read_single_category($entity_id,$cat_id);
+
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols_return'=>$cols_return,'cols'=>$cols,
!
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query,'lookup'=>$lookup,'location_level'=>$category['location_level']));
$this->bocommon->fm_cache('sql_entity_' .
$entity_id . '_' . $cat_id,$sql);
Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** class.uiadmin_entity.inc.php 23 Oct 2003 16:52:15 -0000 1.6
--- class.uiadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.7
***************
*** 695,698 ****
--- 695,701 ----
$entity = $this->bo->read_single($entity_id,false);
+ // $location_types =
$this->bocommon->soadmin_location->select_location_type();
+ // $max_location_type=count($location_types);
+
$msgbox_data = $this->bocommon->msgbox_data($receipt);
***************
*** 724,728 ****
'lang_lookup_vendor' =>
lang('lookup vendor'),
'value_lookup_vendor' =>
$values['lookup_vendor'],
! 'lang_lookup_vendor_statustext' => lang('If
this entity type is to look up vendors')
);
--- 727,735 ----
'lang_lookup_vendor' =>
lang('lookup vendor'),
'value_lookup_vendor' =>
$values['lookup_vendor'],
! 'lang_lookup_vendor_statustext' => lang('If
this entity type is to look up vendors'),
! 'lang_location_level' =>
lang('location level'),
! 'location_level_list' =>
$this->bo->get_location_level_list($values['location_level']),
! 'lang_location_level_statustext' =>
lang('select location level'),
! 'lang_no_location_level' =>
lang('None'),
);
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.uientity.inc.php 23 Oct 2003 16:52:14 -0000 1.3
--- class.uientity.inc.php 26 Oct 2003 20:33:01 -0000 1.4
***************
*** 597,606 ****
!
$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
'lookup_type' => $lookup_type
));
if($category['lookup_vendor'])
--- 597,609 ----
! if($entity['location_form'])
! {
!
$location_data=$this->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
));
+ }
if($category['lookup_vendor'])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.87, 1.88 class.uiadmin_entity.inc.php, 1.6, 1.7 class.uientity.inc.php, 1.3, 1.4 class.soentity.inc.php, 1.5, 1.6 class.soadmin_entity.inc.php, 1.7, 1.8 class.boadmin_entity.inc.php, 1.4, 1.5,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] api class.phpgw.php, 1.1.1.1.2.7, 1.1.1.1.2.8 class.xmltool.php, 1.1.1.1.2.2, 1.1.1.1.2.3 core_functions.inc.php, 1.1.1.1.2.4, 1.1.1.1.2.5
- Next by Date:
[Phpgroupware-cvs] property/templates/default admin_entity.xsl, 1.5, 1.6 entity.xsl, 1.3, 1.4
- Previous by thread:
[Phpgroupware-cvs] api class.phpgw.php, 1.1.1.1.2.7, 1.1.1.1.2.8 class.xmltool.php, 1.1.1.1.2.2, 1.1.1.1.2.3 core_functions.inc.php, 1.1.1.1.2.4, 1.1.1.1.2.5
- Next by thread:
[Phpgroupware-cvs] property/templates/default admin_entity.xsl, 1.5, 1.6 entity.xsl, 1.3, 1.4
- Index(es):