[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11649]
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11649] |
Date: |
Sat, 01 Feb 2014 17:20:29 +0000 |
Revision: 11649
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11649
Author: sigurdne
Date: 2014-02-01 17:20:29 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/property/inc/class.bolocation.inc.php
trunk/property/inc/class.soentity.inc.php
Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2014-01-31 18:48:50 UTC (rev
11648)
+++ trunk/property/inc/class.bolocation.inc.php 2014-02-01 17:20:29 UTC (rev
11649)
@@ -542,9 +542,10 @@
$p_cat_id =
isset($data['entity_data'][$entity['id']]['p_cat_id']) ?
$data['entity_data'][$entity['id']]['p_cat_id'] : '';
$lookup_functions[] = array
(
- 'name' =>
'lookup_entity_' . $entity['id'] .'()',
- 'link' =>
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
- 'action' =>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+ 'filter_level'
=> $config_count,
+ 'name'
=> 'lookup_entity_' . $entity['id'] .'()',
+ 'link'
=>
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
+ 'action'
=>
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
);
$location['location'][$i]['input_type']
= 'text';
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2014-01-31 18:48:50 UTC (rev
11648)
+++ trunk/property/inc/class.soentity.inc.php 2014-02-01 17:20:29 UTC (rev
11649)
@@ -858,6 +858,7 @@
'datatype' => false,
'attrib_id' => false
);
+
$dataset[$j]['_type'] = array
(
'value' => $this->type,
@@ -865,9 +866,15 @@
'attrib_id' => false
);
-
if($lookup)
{
+ $dataset[$j]["entity_num_{$entity_id}"]
= array
+ (
+ 'value' =>
$this->db->f('id'),
+ 'datatype' =>
false,
+ 'attrib_id' =>
false,
+ );
+
$dataset[$j]["entity_cat_name_{$entity_id}"] = array
(
'value' =>
$category['name'],
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11649],
Sigurd Nes <=