bareos: master cf5480ae

Diff Back to Repository
Author Committer Branch Timestamp Parent
frank joergs master 2023-04-13 14:14 master ecb19ab0 Pending
Changeset webui: make restore merge options configurable

If you select a client in the webui restore module the default is that
according jobs and filesets get merged for the file tree presentation.

In larger environments you probably do not want this default behaviour.

Therefore, this commit introduces two new configuration.ini settings
to switch the default merge option behaviour in webui restore.

The newly introduced configuration.ini parameters are "merge_jobs"
and "merge_filesets" in the restore section.

Co-authored-by: Joerg Steffens <joerg.steffens@bareos.com>
mod - webui/config/autoload/global.php.in Diff File
mod - webui/install/configuration.ini.in Diff File
mod - webui/module/Auth/src/Auth/Controller/AuthController.php Diff File
mod - webui/module/Restore/src/Restore/Controller/RestoreController.php Diff File
mod - webui/module/Restore/src/Restore/Form/RestoreForm.php Diff File
mod - webui/module/Restore/src/Restore/Model/RestoreModel.php Diff File
mod - webui/module/Restore/view/restore/restore/index.phtml Diff File
mod - webui/module/Restore/view/restore/restore/versions.phtml Diff File
mod - webui/public/js/bootstrap-table-formatter.js Diff File