Skip to content

Improve JobLogs formatting#525

Merged
frb121 merged 3 commits intobareos:masterfrom
tikoflano:Add-links-to-joblogs
Jun 15, 2020
Merged

Improve JobLogs formatting#525
frb121 merged 3 commits intobareos:masterfrom
tikoflano:Add-links-to-joblogs

Conversation

@tikoflano
Copy link
Contributor

@tikoflano tikoflano commented May 17, 2020

This improves the JobLog message formating, as described in a24e244.

This benefits AFAIK Consolidation, Migration and Copy Jobs, and those type of Jobs didn't have the details button so I added it. I modified the code that selects what buttons to show depending on the Job status and type so every job have at least the details button. It doesn't make sense to me to have a row without taht button at least.

This change makes it very simple and obvious the way to keep adding formatting rules when needed.

@tikoflano tikoflano mentioned this pull request May 17, 2020
Closed
@frb121 frb121 self-requested a review May 27, 2020 08:41
@frb121
Copy link
Contributor

frb121 commented May 27, 2020

Thanks for the PR, Alvaro.

I do have a few change requests. Please rebase and cleanup the PR, like set the correct author and get rid of the merge message.

  • Please combine 1559cde and a24e244 into one commit and change the commit message subject from "Improvements to format the JobLog messages." to sth. like "webui: improve JobLog message formatting."

  • Please change the commit message subject of f8e5da0 from "By default every job should at least have the "details" button." to sth. like "webui: set a default action button on jobs"

  • Please change the commit message subject of e53fba3 from "Show details button for Consolidate jobs" to sth. like "webui: show the job details action button for consolidation jobs".

See https://docs.bareos.org/DeveloperGuide/gitworkflow.html?#git-workflow for some general information about our git workflow.

@frb121
Copy link
Contributor

frb121 commented Jun 10, 2020

Hello Alvaro,

will you implement the proposed changes? We would like to merge the PR soon. If there is currently no time available at yours, please give us a short feedback, then we will take care of the changes to the PR ourselves and merge them afterwards.

Regards,
Frank

@tikoflano tikoflano force-pushed the Add-links-to-joblogs branch from 5ec8742 to 9928cd6 Compare June 11, 2020 05:29
@tikoflano
webui: improve JobLog message formatting
d188c6b 
Signed-off-by: Alvaro Flaño <tikoflano@gmail.com>
@tikoflano tikoflano force-pushed the Add-links-to-joblogs branch from 9928cd6 to d188c6b Compare June 11, 2020 05:45
@tikoflano
Copy link
Contributor Author

tikoflano commented Jun 11, 2020

OK. I had some troubles understanding correctly how to rebase my commits. Is this ok now?

@frb121
Copy link
Contributor

frb121 commented Jun 15, 2020

Looking good and can be merged. Thank you.

@frb121 frb121 merged commit e487084 into bareos:master Jun 15, 2020
@tikoflano tikoflano deleted the Add-links-to-joblogs branch June 15, 2020 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@frb121 frb121 frb121 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@tikoflano @frb121