[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7244] property: fix menu
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7244] property: fix menu |
Date: |
Tue, 03 May 2011 08:18:22 +0000 |
Revision: 7244
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7244
Author: sigurdne
Date: 2011-05-03 08:18:22 +0000 (Tue, 03 May 2011)
Log Message:
-----------
property: fix menu
Modified Paths:
--------------
trunk/property/inc/class.menu.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.uientity.inc.php
Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php 2011-05-03 05:31:30 UTC (rev
7243)
+++ trunk/property/inc/class.menu.inc.php 2011-05-03 08:18:22 UTC (rev
7244)
@@ -929,7 +929,7 @@
'text' => lang('gallery')
);
- $custom_menu_items=
$custom_menus->read(array('type' => 'custom_menu_items' , 'filter' =>
array('location' => '.document')));
+ $custom_menu_items=
$custom_menus->read(array('type' => 'custom_menu_items'), array('location' =>
'.document'));
foreach($custom_menu_items as $item)
{
$menus['navigation']['documentation']['children'][] = array
@@ -970,12 +970,14 @@
$menus['navigation']["entity_{$entry['id']}"]['children'] =
$entity->read_category_tree($entry['id'],'property.uientity.index',
PHPGW_ACL_READ);
}
-
$custom_menu_items=
$custom_menus->read_tree(array('type' => 'custom_menu_items' , 'filter' =>
array('location' => ".entity.{$entry['id']}")));
if($custom_menu_items)
{
-
$menus['navigation']["entity_{$entry['id']}"]['children'] =
array_merge($menus['navigation']["entity_{$entry['id']}"]['children'],
$custom_menu_items);
+ foreach
($custom_menu_items as $item)
+ {
+
$menus['navigation']["entity_{$entry['id']}"]['children'][] = $item;
+ }
}
/*
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2011-05-03 05:31:30 UTC (rev
7243)
+++ trunk/property/inc/class.sogeneric.inc.php 2011-05-03 08:18:22 UTC (rev
7244)
@@ -50,7 +50,7 @@
$this->_join = & $this->_db->join;
}
- function read($data, $filter)
+ function read($data, $filter = array())
{
$start = isset($data['start']) &&
$data['start'] ? $data['start']:0;
$query =
isset($data['query'])?$data['query']:'';
@@ -2670,14 +2670,16 @@
$fields[] = $field['name'];
}
$node = array();
+ $i = 0;
while ($this->_db2->next_record())
{
$id = $this->_db2->f('id');
foreach($fields as $field)
{
- $tree[$id][$field] =
$this->_db2->f($field,true);
+ $tree[$i][$field] =
$this->_db2->f($field,true);
}
+ $i++;
}
foreach($tree as &$node)
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2011-05-03 05:31:30 UTC (rev
7243)
+++ trunk/property/inc/class.uientity.inc.php 2011-05-03 08:18:22 UTC (rev
7244)
@@ -376,6 +376,11 @@
$datatable = array();
$values_combo_box = array();
+ if($this->cat_id)
+ {
+ $category =
$this->soadmin_entity->read_single_category($this->entity_id,$this->cat_id);
+ }
+
// enters the first time
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
@@ -420,7 +425,6 @@
//// ---- DISTRICT filter----------------------
if($this->cat_id)
{
- $category =
$this->soadmin_entity->read_single_category($this->entity_id,$this->cat_id);
//this validation comes to previous
versions
if (isset($category['location_level'])
&& $category['location_level']>0)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7244] property: fix menu,
Sigurd Nes <=