Merge document fixes

- Give some feedback for single document
- Fix line breaks in long task messages
- Fix link merged document to entries
This commit is contained in:
nathan 2024-05-21 15:10:19 -06:00
parent 700cb987ea
commit aeec9263ef
3 changed files with 5 additions and 3 deletions

View File

@ -871,6 +871,7 @@ export abstract class EgwApp
{
// Handle it all on the server in one request
mergedFiles = await this.egw.request(vars.menuaction, [vars.id, vars.document, vars.options]);
this.egw.message(mergedFiles, "success");
}
else
{

View File

@ -2528,7 +2528,7 @@ abstract class Merge
}
foreach(['pdf', 'individual', 'link'] as $option)
{
$$option = is_null($options) ? (boolean)$_REQUEST['options'][$option] : (boolean)$options[$option];
$$option = is_null($options) || empty($options) ? (boolean)$_REQUEST['options'][$option] : (boolean)$options[$option];
}
$app = (is_null($options) ? $_REQUEST['options']['app'] : $options['app']) ?? $GLOBALS['egw_info']['flags']['currentapp'];
@ -2564,7 +2564,7 @@ abstract class Merge
{
foreach((array)$ids as $id)
{
Api\Link::link($app, $id, Api\Link::VFS_APPNAME, $target);
Api\Link::link($app, $id, Api\Link::VFS_LINK, Vfs::PREFIX . $target);
}
}
}
@ -3237,7 +3237,7 @@ abstract class Merge
'type' => 'taglist',
'label' => 'Merged document filename',
'name' => self::PREF_DOCUMENT_FILENAME,
'values' => self::DOCUMENT_FILENAME_OPTIONS,
'values' => static::DOCUMENT_FILENAME_OPTIONS,
'help' => 'Choose the default filename for merged documents.',
'xmlrpc' => True,
'admin' => False,

View File

@ -2770,6 +2770,7 @@ table.egwGridView_outer thead tr th.noResize:hover {
}
.long_task .message {
white-space: break-spaces;
height: inherit;
display: list-item;
border: none;