mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-06 01:52:08 +02:00
Projectmanager merge class now resolves its own project fields. Infologs can be assigned to eRoles now to resolve infolog fields in document merge. New ability to declare eRoles as -multi- in GUI. This will give us the ability to create a whole list of contents in a document with just one eRole given (not yet implemented).
This commit is contained in:
parent
f8343aa0e3
commit
f174acb6d7
@ -22,7 +22,10 @@ class infolog_merge extends bo_merge
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
var $public_functions = array('show_replacements' => true);
|
var $public_functions = array(
|
||||||
|
'show_replacements' => true,
|
||||||
|
'infolog_replacements' => true,
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Business object to pull records from
|
* Business object to pull records from
|
||||||
@ -63,9 +66,10 @@ class infolog_merge extends bo_merge
|
|||||||
* Get infolog replacements
|
* Get infolog replacements
|
||||||
*
|
*
|
||||||
* @param int $id id of entry
|
* @param int $id id of entry
|
||||||
|
* @param string $prefix='' prefix like eg. 'erole'
|
||||||
* @return array|boolean
|
* @return array|boolean
|
||||||
*/
|
*/
|
||||||
protected function infolog_replacements($id)
|
public function infolog_replacements($id,$prefix='')
|
||||||
{
|
{
|
||||||
$record = new infolog_egw_record($id);
|
$record = new infolog_egw_record($id);
|
||||||
$info = array();
|
$info = array();
|
||||||
@ -93,7 +97,7 @@ class infolog_merge extends bo_merge
|
|||||||
// Add markers
|
// Add markers
|
||||||
foreach($array as $key => $value)
|
foreach($array as $key => $value)
|
||||||
{
|
{
|
||||||
$info['$$' . $key . '$$'] = $value;
|
$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
|
||||||
}
|
}
|
||||||
return $info;
|
return $info;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user