extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix parent / hierarchy view

Browse Source
This commit is contained in:
Nathan Gray 2012-06-18 17:43:39 +00:00
parent 4b8c7bdbe5
commit 5732ee7033
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -171,6 +171,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
{ {
self::$request = etemplate_request::read($exec_id); self::$request = etemplate_request::read($exec_id);
$value = self::get_array(self::$request->content, $form_name, true); $value = self::get_array(self::$request->content, $form_name, true);
if(!is_array($value))
{
$value = ($value) ? array($value) : array();
}
$value = array_merge($value, $filters); $value = array_merge($value, $filters);
//error_log(__METHOD__."('".substr($exec_id,0,10)."...', range=".array2string($queriedRange).', filters='.array2string($filters).", '$form_name', knownUids=".array2string($knownUids).", lastModified=$lastModified) parent_id=$value[parent_id], is_parent=$value[is_parent]"); //error_log(__METHOD__."('".substr($exec_id,0,10)."...', range=".array2string($queriedRange).', filters='.array2string($filters).", '$form_name', knownUids=".array2string($knownUids).", lastModified=$lastModified) parent_id=$value[parent_id], is_parent=$value[is_parent]");
@ -189,7 +193,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
// if app supports parent_id / hierarchy ($value['parent_id'] not empty), set parent_id as filter // if app supports parent_id / hierarchy ($value['parent_id'] not empty), set parent_id as filter
if (($parent_id = $value['parent_id'])) if (($parent_id = $value['parent_id']))
{ {
$value['col_filter']['parent_id'] = $queriedRange['parent_id']; $value['col_filter'][$parent_id] = $queriedRange['parent_id'];
} }
$rows = $result['data'] = $result['order'] = array(); $rows = $result['data'] = $result['order'] = array();
$result['total'] = self::call_get_rows($value, $rows, $result['readonlys']); $result['total'] = self::call_get_rows($value, $rows, $result['readonlys']);
@ -325,6 +329,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
} }
} }
} }
if (!is_array($raw_rows)) $raw_rows = array();
if (!is_array($readonlys)) $readonlys = array(); if (!is_array($readonlys)) $readonlys = array();
if(is_callable($method)) // php5.2.3+ static call (value is always a var param!) if(is_callable($method)) // php5.2.3+ static call (value is always a var param!)
{ {

2
etemplate/js/et2_extension_nextmatch.js
View File

@ -621,7 +621,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], {
_controller, _controller,
this.egw(), this.egw(),
this.getInstanceManager().etemplate_exec_id, this.getInstanceManager().etemplate_exec_id,
"nm", this,
rowId, rowId,
grid, grid,
this.rowProvider, this.rowProvider,