extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix single vfs select link customfield did not show files, used wrong filename

Browse Source
This commit is contained in:
nathan 2024-10-16 09:19:41 -06:00
parent 7101356993
commit 74fa7e6912
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/etemplate/et2_extension_customfields.ts
View File

@ -914,16 +914,17 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
// Create upload widget // Create upload widget
let upload_attrs = {...attrs}; let upload_attrs = {...attrs};
if(typeof field.values?.noUpload !== "undefined")
{
upload_attrs.class = "hideme";
}
let widget = this.widgets[field_name] = <et2_DOMWidget>et2_createWidget(attrs.type ? attrs.type : field.type, upload_attrs, this); let widget = this.widgets[field_name] = <et2_DOMWidget>et2_createWidget(attrs.type ? attrs.type : field.type, upload_attrs, this);
// This controls where the widget is placed in the DOM // This controls where the widget is placed in the DOM
this.rows[attrs.id] = cf[0]; this.rows[attrs.id] = cf[0];
jQuery(widget.getDOMNode(widget)).css('vertical-align','top'); jQuery(widget.getDOMNode(widget)).css('vertical-align','top');
// Should we show the upload button
if(typeof field.values?.noUpload !== "undefined")
{
widget.node.querySelector('et2-button').classList.add("hideme");
}
// should we show the VfsSelect // should we show the VfsSelect
if (!field.values || typeof field.values !== 'object' || !field.values.noVfsSelect) if (!field.values || typeof field.values !== 'object' || !field.values.noVfsSelect)
{ {
@ -958,6 +959,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
document.querySelectorAll('et2-link-list').forEach(l => {l.get_links();}); document.querySelectorAll('et2-link-list').forEach(l => {l.get_links();});
const info = e.target._dialog.fileInfo(e.target.value); const info = e.target._dialog.fileInfo(e.target.value);
e.target.getParent().getWidgetById("#filemanager")?._addFile(info); e.target.getParent().getWidgetById("#filemanager")?._addFile(info);
e.target.getParent().getWidgetById("#filemanager").getDOMNode().classList.remove("hideme");
}); });
jQuery(widget.getDOMNode(widget)).css('vertical-align','top').prependTo(cf); jQuery(widget.getDOMNode(widget)).css('vertical-align','top').prependTo(cf);
} }

12
api/src/Etemplate/Widget/Link.php
View File

@ -314,9 +314,17 @@ class Link extends Etemplate\Widget
} }
else else
{ {
foreach($files as $target) if(!str_ends_with($dest_file, '/') && count($files) == 1)
{ {
Api\Link::link_file($app, $id, $target); // 1 file to a specific filename
Api\Vfs::symlink($files[0], Api\Link::vfs_path($app, $id));
}
else
{
foreach($files as $target)
{
Api\Link::link_file($app, $id, $target);
}
} }
} }
} }