Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webui: make restore merge options configurable #1445

Merged
merged 3 commits into from
Apr 25, 2023
Merged

webui: make restore merge options configurable #1445

merged 3 commits into from
Apr 25, 2023

Conversation

fbergkemper
Copy link
Contributor

@fbergkemper fbergkemper commented Apr 13, 2023

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.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Check backport line
  • Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

fbergkemper and others added 2 commits April 24, 2023 12:03
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>
@joergsteffens joergsteffens merged commit 2107135 into bareos:master Apr 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants