extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-26 23:21:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use new VFS Select in customfield type application-filemanager

Browse Source
This commit is contained in:
nathan 2024-02-26 14:26:14 -07:00
parent 1c34821afd
commit 11f9196b42
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
View File

@ -304,7 +304,7 @@ export class Et2VfsSelectDialog
// Set current file to first value // Set current file to first value
if(this.value && this.value[0]) if(this.value && this.value[0])
{ {
this.setCurrentFile(this._fileNodes.find(node => node.value.path == this.value[0])); this.setCurrentResult(this._fileNodes.find(node => node.value.path == this.value[0]));
} }
}); });
} }
@ -487,7 +487,7 @@ export class Et2VfsSelectDialog
} }
// Update selection, value, and display label // Update selection, value, and display label
this.selectionChanged(); this.searchResultSelected();
} }
/** /**

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

@ -26,6 +26,7 @@ import {et2_cloneObject, et2_no_init} from "./et2_core_common";
import {et2_DOMWidget} from "./et2_core_DOMWidget"; import {et2_DOMWidget} from "./et2_core_DOMWidget";
import {loadWebComponent} from "./Et2Widget/Et2Widget"; import {loadWebComponent} from "./Et2Widget/Et2Widget";
import {LitElement} from "lit"; import {LitElement} from "lit";
import {Et2VfsSelectButton} from "./Et2Vfs/Et2VfsSelectButton";
export class et2_customfields_list extends et2_valueWidget implements et2_IDetachedDOM, et2_IInput export class et2_customfields_list extends et2_valueWidget implements et2_IDetachedDOM, et2_IInput
{ {
@ -808,19 +809,19 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
attrs, attrs,
// Filemanager select // Filemanager select
{ {
label: '', path: '~',
mode: widget.options.multiple ? 'open-multiple' : 'open', mode: widget.options.multiple ? 'open-multiple' : 'open',
method: 'EGroupware\\Api\\Etemplate\\Widget\\Link::ajax_link_existing', method: 'EGroupware\\Api\\Etemplate\\Widget\\Link::ajax_link_existing',
method_id: attrs.path, methodId: attrs.path,
button_label: egw.lang('Link') buttonLabel: this.egw().lang('Link')
}, {type: 'vfs-select'}); }, {type: 'et2-vfs-select'});
select_attrs.id = attrs.id + '_vfs_select'; select_attrs.id = attrs.id + '_vfs_select';
// This controls where the button is placed in the DOM // This controls where the button is placed in the DOM
this.rows[select_attrs.id] = cf[0]; this.rows[select_attrs.id] = cf[0];
// Do not store in the widgets list, one name for multiple widgets would cause problems // Do not store in the widgets list, one name for multiple widgets would cause problems
widget = <et2_DOMWidget>et2_createWidget(select_attrs.type, select_attrs, this); widget = <Et2VfsSelectButton>loadWebComponent(select_attrs.type, select_attrs, this);
jQuery(widget.getDOMNode(widget)).css('vertical-align','top').prependTo(cf); jQuery(widget.getDOMNode(widget)).css('vertical-align','top').prependTo(cf);
} }
return false; return false;

7
api/src/Etemplate/Widget/Vfs.php
View File

@ -620,6 +620,13 @@ class Vfs extends File
{ {
$content['path'] = $response['path'] = Api\Vfs::get_home_dir(); $content['path'] = $response['path'] = Api\Vfs::get_home_dir();
} }
if(!Api\Vfs::is_readable($content['path']))
{
if($content['path'] && str_contains($content['path'], ':') && $path = static::get_vfs_path($content['path']))
{
$content['path'] = $response['path'] = $path;
}
}
$response['writable'] = Api\Vfs::is_writable($content['path']); $response['writable'] = Api\Vfs::is_writable($content['path']);
// Filemanager favorites as directories // Filemanager favorites as directories