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.

Sign up for GitHub

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

Incorporate non-standard proposal in pdf workflow #574

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Incorporate non-standard proposal in pdf workflow #574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
400071f
fix for issue 572
EdoStorm96 Nov 9, 2023
15410f6
Removed pdf_template_name property of proposal model
EdoStorm96 Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions proposals/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,13 +703,7 @@ def generate_pdf(self, force_overwrite=False):

@property
def pdf_template_name(self):
"""Determine the correct PDf template for this proposal."""
template_name = 'proposals/proposal_pdf.html'
if self.is_pre_approved:
template_name = 'proposals/proposal_pdf_pre_approved.html'
elif self.is_pre_assessment:
template_name = 'proposals/proposal_pdf_pre_assessment.html'
return template_name
return 'proposals/proposal_pdf.html'
Copy link
Member

Choose a reason for hiding this comment

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

I agree that this is redundant now; differences should be handled by the new PDF framework

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I got rid of this now, and its reference in the ProposalAsPDF view. This works fine for me. I was wondering does this now require a migration?

Copy link
Member

Choose a reason for hiding this comment

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

No it doesn't. Migrations are only needed for ORM Fields (which are always class variables, and (almost) always named xField). This is a class method, those should never trigger migrations.

If you are unsure, you can run python manage.py makemigrations --dry-run. This will only display the migrations Django wants to create, without actually creating them.

Alternatively, we now have a check for PR's that will tell you if you are missing a migration. The latest run passed successfully: https://github.com/DH-IT-Portal-Development/ethics/actions/runs/6847879373/job/18616976001?pr=574


def use_canonical_pdf(self):
"""Returns False if this proposal should regenerate its PDF
Expand Down
Loading
Loading