Skip to content

webui: show DIR message if ACL prevents a job rerun#1110

Merged
pstorz merged 2 commits intobareos:masterfrom
frb121:dev/fbergkemper/master/s5103
Mar 10, 2022
Merged

webui: show DIR message if ACL prevents a job rerun#1110
pstorz merged 2 commits intobareos:masterfrom
frb121:dev/fbergkemper/master/s5103

Conversation

@frb121
Copy link
Contributor

@frb121 frb121 commented Mar 9, 2022

In case ACL settings prevent to rerun a job, e.g. lack of access to particular resources,
it should fail gracefully with an error message.

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)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
  • If backport: add original PR number and target branch at top of this file: Backport of PR#000 to bareos-2x
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
  • bareos-check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing
Tests
  • Decision taken that a system- or unittest is required (if not, then remove this paragraph)
  • The decision towards a systemtest is reasonable compared to a unittest
  • Testname matches exactly what is being tested
  • Output of the test leads quickly to the origin of the fault

@pstorz pstorz self-requested a review March 10, 2022 09:36
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, I just see that in this PR and the Backports the webui-admin-rerun test fails

@frb121
Copy link
Contributor Author

frb121 commented Mar 10, 2022

Unfortunately, I just see that in this PR and the Backports the webui-admin-rerun test fails

My bad, I had overlooked that str_contains is only compatible with PHP >= 8. I replaced str_contains with a preg_match.

@pstorz pstorz self-requested a review March 10, 2022 13:27
@pstorz pstorz merged commit 00d9264 into bareos:master Mar 10, 2022
@frb121 frb121 deleted the dev/fbergkemper/master/s5103 branch April 21, 2023 10:51
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.

2 participants