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

Fix/textual bugs #833

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Fix/textual bugs #833

merged 4 commits into from
Jan 7, 2025

Conversation

EdoStorm96
Copy link
Contributor

fixes #829

So this fixes two bugs.

The homepage trans tags:
Djlint made the html inside the trans tags multi-line, so it required blocktrans tags.

the inform_local_staff label:
So ... the big one. I had a closer look at how another label was marked safe, namely other_stakeholders ... I've just gone and implemented this the same way. It is really ugly ... but it does work (for now ... seemingly ...), which is nice at this point!

So basically, you just override the label in the form and mark it safe there. This means this label exists in two places. The label in the model is just there for reference. This kinda sucks, but I guess this is how we did it before?

I found that the other_stakeholders label in the form was mark_safe'd twice, which AFAICT is redundant, so I removed this.

Let me know what you think :)

@EdoStorm96 EdoStorm96 requested a review from miggol January 6, 2025 13:44
Copy link
Contributor

@miggol miggol left a comment

Choose a reason for hiding this comment

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

Very glad you could crack this!

Comment on lines +839 to +841
self.fields["inform_local_staff"].label = self.fields[
"inform_local_staff"
].label
Copy link
Contributor

Choose a reason for hiding this comment

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

For me, this part is not necessary to fix the bug.

But it's also harmless.

Copy link
Contributor

Choose a reason for hiding this comment

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

The same goes for the other_stakeholders part, which never gave us any trouble. I have no rational reasoning but feel like keeping it in just to be safe.

@EdoStorm96 EdoStorm96 merged commit c4ef888 into major/4 Jan 7, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants