Skip to content

webui: Backup Unit Report fixes#1696

Merged
BareosBot merged 5 commits intobareos:masterfrom
joergsteffens:dev/joergs/master/webui-subscription
Feb 5, 2024
Merged

webui: Backup Unit Report fixes#1696
BareosBot merged 5 commits intobareos:masterfrom
joergsteffens:dev/joergs/master/webui-subscription

Conversation

@joergsteffens
Copy link
Member

@joergsteffens joergsteffens commented Feb 2, 2024 •
edited by bruno-at-bareos
Loading

Thank you for contributing to the Bareos Project!

Fix the URL of the Backup Unit Report and prevent some unnecessary escapes in the JSON file.

OP#5697

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

@bruno-at-bareos
Copy link
Contributor

bruno-at-bareos commented Feb 5, 2024

We want to fix the pr tool complain about the copyrights

bareos-check-sources --since=49ae6652a18a3c8987fee698394d46ffbebde55c reported:
[2024-02-02T13:22:38.155Z] 	Plugin 'fix copyright year' would modify 'webui/module/Director/src/Director/Controller/DirectorController.php'
[2024-02-02T13:22:38.155Z] 	Plugin 'fix copyright year' would modify 'webui/module/Director/view/director/director/subscription.phtml'

bruno-at-bareos
bruno-at-bareos approved these changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos left a comment

Choose a reason for hiding this comment

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

Thanks for the work.
I will create the backports

This was referenced Feb 5, 2024
Merged
Merged
joergsteffens and others added 5 commits February 5, 2024 15:37
@joergsteffens @BareosBot
webui: fix url of backupunitreport
d49fe24
@joergsteffens @BareosBot
webui: unitreport: prevent unnecessary escapes
3518257 
before the report did contain lines like:
"fileset": "\u003Call file-based\u003E"

Now it will be stored in the valid and intended form:
"fileset": "<all file-based>"

Also "/" will no longer be escaped (like in "Debian GNU\/Linux").
@joergsteffens @BareosBot
docs: add anchor label status-subscription
a6fe288
@bruno-at-bareos @BareosBot
apply copyright update
ee16f8d
@BareosBot
Update CHANGELOG.md
9f2b3a7
@BareosBot BareosBot force-pushed the dev/joergs/master/webui-subscription branch from 9b0b257 to 9f2b3a7 Compare February 5, 2024 15:37
@BareosBot BareosBot merged commit 6853fc1 into bareos:master Feb 5, 2024
@joergsteffens joergsteffens deleted the dev/joergs/master/webui-subscription branch February 5, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bruno-at-bareos bruno-at-bareos bruno-at-bareos approved these changes

Assignees

@bruno-at-bareos bruno-at-bareos

Labels

requires backport to 22 requires backport to 23

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@joergsteffens @bruno-at-bareos @BareosBot