DST-951 - Save & Return - Second trio of views #190
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
# Conflicts: # django_app/apply_for_a_licence/views/views_start.py # django_app/config/settings/base.py
morganmaerees
approved these changes
Feb 10, 2025
| licence.professional_or_business_services = [] | ||
| licence.licensing_grounds = [] | ||
|
|
||
| if old_value == TypeOfServicesChoices.interception_or_monitoring.value: |
| @property | ||
| def pk_url_kwarg(self) -> str: | ||
| if self.model: | ||
| return f"{self.model.__name__.lower()}_uuid" |
| @@ -94,13 +103,11 @@ def get_success_url(self) -> str: | |||
| else: | |||
| success_url = reverse("where_is_the_business_located", kwargs={"business_uuid": self.kwargs.get("business_uuid")}) | |||
|
|
|||
| if get_parameters := urllib.parse.urlencode(self.request.GET): | |||
| success_url += "?" + get_parameters | |||
There was a problem hiding this comment.
Do we no longer need this for the redirect url parameter? Is that in the baseview already?
There was a problem hiding this comment.
@morganmaerees - this is all handled by the baseview already
|
|
||
| if type_of_service := self.changed_fields.get("type_of_service", False): | ||
| if self.form.has_field_changed("type_of_service"): | ||
| # if the type of service has changed, we want to clear the session data for the next steps |
There was a problem hiding this comment.
Not sure if this comment matches what's happening anymore, this is done elsewhere
There was a problem hiding this comment.
good point!
django_app/config/settings/base.py
Outdated
| @@ -289,7 +292,7 @@ | |||
|
|
|||
| SESSION_EXPIRE_AT_BROWSER_CLOSE = True | |||
| # Session cookie age is set to 40 minutes | |||
| SESSION_COOKIE_AGE = 40 * 60 | |||
| SESSION_COOKIE_AGE = 500 * 60 | |||
There was a problem hiding this comment.
Was this just for testing?
There was a problem hiding this comment.
Yes good spot, thanks.
jenriordan
pushed a commit
that referenced
this pull request
Feb 11, 2025
* business journey * alter delete view and fix tests * updating individual views to save and return * yourself views * fixing tests * fixing test * Delete view requiers login * add formclass to delete view * updating migrations * removing print statements * modifiying uuid field migration * Adding default to uuid for migration * updating migrations again * get uuid as primary key field * updating to use id instead of uuid * review comments * Updating yourself views * licence id object * Making slow work * More fixes * migration fixing * fixing tests * migrations * mypi * fixing tests * fixing tests * fixing tests * fixing tests * fixing tests * fixing tests * fixing tests * fixing tests * fixing FE tests * Morgan comments * fixing tests * fixing tests --------- Co-authored-by: Morgan Rees <[email protected]>
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.
No description provided.