Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-02 23:22:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed document API agenda event list and download

Browse Source
This commit is contained in:
William Mead
2025-12-18 11:22:33 +01:00
parent fcefef410c
commit a66a897a07
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/api/class/api_documents.class.php
View File

@@ -602,6 +602,7 @@ class Documents extends DolibarrApi
}
$upload_dir = getMultidirOutput($object) . '/'.dol_sanitizeFileName($object->ref);
$upload_dir = $conf->agenda->multidir_output[$object->entity ?? $conf->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'agenda');
} elseif ($modulepart == 'expensereport') {
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

2
htdocs/core/lib/files.lib.php
View File

@@ -3254,7 +3254,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
}
$modulepartsuffix = str_replace('tax-', '', $modulepart);
$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
} elseif (($modulepart == 'actions' || $modulepart == 'actioncomm') && !empty($conf->agenda->dir_output)) {
// Wrapping for events
if ($fuser->hasRight('agenda', 'myactions', $read)) {
$accessallowed = 1;