Fix/post testing requests #818
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was
linked to
issues
Dec 10, 2024
miggol
requested changes
Dec 18, 2024
There was a problem hiding this comment.
Double check migrations before merging
| @@ -52,7 +52,7 @@ class Observation(SettingModel): | |||
| ) | |||
|
|
|||
| details_frequency = models.TextField( | |||
| _("Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd."), | |||
| _("Beschrijf <b>hoe vaak en hoelang</b> de observant wordt geobserveerd."), | |||
There was a problem hiding this comment.
Still looks weird to me. But it is correct apparently
reviews/utils/review_actions.py
Outdated
| @@ -245,14 +245,17 @@ def is_available(self): | |||
| return False | |||
|
|
|||
| if ( | |||
| review.proposal.embargo == True | |||
| review.proposal.embargo_end_date is not None | |||
There was a problem hiding this comment.
As far as I know we don't reset embargo_end_date when an applicant sets embargo back to False. So there are potentially proposals with no embargo but yes embargo_end_date.
Therefore you must check both here.
| @@ -17,7 +17,7 @@ | |||
| <td>{{ decision.reviewer.get_full_name }}</td> | |||
| <td>{{ decision.get_go_display|default:_("open") }}</td> | |||
| <td data-order="{{ decision.date_decision|date:'c' }}">{{ decision.date_decision|date:"j F Y, G:i" }}</td> | |||
| <td>{{ decision.comments }}</td> | |||
| <td>{{ decision.comments | linebreaks }}</td> | |||
There was a problem hiding this comment.
I never knew about this filter. Now I feel like an idiot for <br />ifying everything by hand in grant-tool. Good find
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch features a lot of tiny issues, that have been uncovered following the testing of 4.0.
In rough order of commits:
#789: Apparently the observation table still included fields from v1 observations and we never noticed. It now includes the new fields.
#809: The Stepper bubbles were untranslated ... My first hunch was to replace gettext with gettext_lazy and this works. Don't ask me why ...
#811: Increase the max length of trajectory names from 15 to 30.
#814: Include linebreaks in review comments for the Secretary to read comfortably.
No issue: Remove more remnant of the old AvailableURL system ...
#813: Untranslated text.
#817: A server errors caused by some shoddy validation and logic regarding embargo and embargo_end_date.
#777: Remove the embargo question from the submit form for PreAss proposals, ensure that PreAss proposals are never placed in the archive and remove the ChangeArchiveStatus review action if a proposal is PreAss.
Its a lot of issues ... But the fixes are mostly one or two lines, so it should be manageable I hope :)