extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge document dialog used user preference over action path, even if it was missing

Browse Source
This commit is contained in:
nathan 2024-12-20 08:37:08 -07:00
parent 946b0a5e43
commit fd52a2fee5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/jsapi/egw_app.ts
View File

@ -927,6 +927,7 @@ export abstract class EgwApp
options : { [p : string] : string | boolean } options : { [p : string] : string | boolean }
}> }>
{ {
// Check path from action and user's preferred path
let path = action?.data?.merge_data?.directory ?? ""; let path = action?.data?.merge_data?.directory ?? "";
let dirPref = <string>this.egw.preference('document_dir', this.appname) ?? ""; let dirPref = <string>this.egw.preference('document_dir', this.appname) ?? "";
let dirs = dirPref.split('/[,\s]+\//'); let dirs = dirPref.split('/[,\s]+\//');
@ -937,6 +938,9 @@ export abstract class EgwApp
d = "/" + d; d = "/" + d;
} }
}); });
dirs.push(path);
dirs = dirs.filter((d, index, array) => (d && array.indexOf(d) === index));
let fileSelect = <Et2MergeDialog><unknown>loadWebComponent('et2-merge-dialog', { let fileSelect = <Et2MergeDialog><unknown>loadWebComponent('et2-merge-dialog', {
application: this.appname, application: this.appname,
path: dirs.pop() || "" path: dirs.pop() || ""