holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nested placeholders (customfields from other apps) were not being displayed properly

Browse Source
This commit is contained in:
nathan 2021-10-07 14:51:16 -06:00
parent c73a7beac8
commit d43c27a31b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_placeholder.ts
View File

@ -339,7 +339,7 @@ export class et2_placeholder_select extends et2_inputWidget
{ {
continue; continue;
} }
options[key].push({ options[this.egw().lang(key)].push({
value: key + '-' + sub, value: key + '-' + sub,
label: this.egw().lang(sub) label: this.egw().lang(sub)
}); });

2
api/src/Storage/Merge.php
View File

@ -3085,7 +3085,7 @@ abstract class Merge
$app = self::get_app_class($field['type']); $app = self::get_app_class($field['type']);
if($app) if($app)
{ {
$this->add_linked_placeholders($placeholders, $name, $app->get_placeholder_list('#' . $name)); $this->add_linked_placeholders($placeholders, $name, $app->get_placeholder_list(($prefix ? $prefix . '/' : '') . '#' . $name));
} }
} }
else else

2
infolog/inc/class.infolog_merge.inc.php
View File

@ -316,7 +316,7 @@ class infolog_merge extends Api\Storage\Merge
[lang($tracking->field2label['info_from']) => []] + [lang($tracking->field2label['info_from']) => []] +
array_slice($placeholders, $insert_index, count($placeholders) - $insert_index, true); array_slice($placeholders, $insert_index, count($placeholders) - $insert_index, true);
$contact_merge = new Api\Contacts\Merge(); $contact_merge = new Api\Contacts\Merge();
$contact = $contact_merge->get_placeholder_list('info_contact'); $contact = $contact_merge->get_placeholder_list($this->prefix($prefix, 'info_contact'));
$this->add_linked_placeholders($placeholders, lang($tracking->field2label['info_from']), $contact); $this->add_linked_placeholders($placeholders, lang($tracking->field2label['info_from']), $contact);
return $placeholders; return $placeholders;