Repository navigation
Conversation
Re-applies the registration stages, tasks and portal of T3523, reverted from 18.0 after its first merge, as tested on stage (migrations numbered after T3569).
…owner The generic /website/form accepted any registration_id: anyone could add flights, overwrite a passport or comment on another participant's registration. The portal ACL also let participants write any flight, task or registration form. - Participant forms post to /my/events/form/<form>, which checks the registration belongs to the logged-in user (website_form_access off). - Passport and criminal record are downloaded through /my/events/<id>/document/<document>, for the owner or the staff group. - Task clicks are limited to the owner; portal access is read-only on their own flights and tasks. - The public registration form ignores partner_id and match_update. (cherry picked from commit 8e8c7dc)
(cherry picked from commit 2c62def)
Out of the website's default language, the form action gets a language prefix and Odoo drops its trailing slash, so the forms posted to /fr_CH/my/events/formregistration_edit and nothing was saved. The slash now goes with force_action. (cherry picked from commit 3101081efeca2f149064e805cbf154aef4db5dcd)
Each direction has its page, lists the flights given and lets the participant add as many connection flights as needed or remove one. The one-flight-per-direction constraint is dropped. Removing the last flight of a direction unticks its task. Task links on the registration pages no longer depend on the page they are shown on.
After the documents, the registration waits in Fill documents; the person responsible moves it to Criminal record, which sends the request.
This file contains hidden or 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
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.
[STAGING REQUIRED] Must be tested on Stage prior to production merge.
T3523 - Tours & Visit / Muskathlon registration process (re-applied, with T3572 and the demo changes)
Branches
T3523-tours-visit-registration-2, based on18.0:website_event_compassion,muskathlon)website_switzerland)partner_communication), branchT3523-tours-visit-registrationThe PRs of the three repositories go together: merge them into stage together, and into 18.0 together.
It replaces the T3572 PRs to stage (#435, CompassionCH/compassion-switzerland#1869), whose commits are included.
Why a new PR
The first T3523 PRs (#423 in compassion-website, #1856 in compassion-switzerland) were merged into 18.0, then reverted there ("REM T3523"), and kept on stage only. T3572 (#435, #1869) was opened against stage on top of them. Following the staging process, this PR brings the whole feature back to 18.0 as one Draft PR per repository:
muskathlon) and T3651 (website_switzerland18.0.1.0.11). The full description of this part is in the first PRs (T3523 tours visit registration #423, #1856).Nothing else from stage is included.
Changes asked at the demo
Flights: one page per direction, with connection flights
Before, the "Give outbound flight" and "Give return flight" tasks both opened the same page, which held one flight per direction.
/my/events/<registration>/flight/outboundand/flight/return. The task of each direction opens its page.website_event_compassion18.0.1.6.6 removes the database constraint).muskathlonandwebsite_switzerlandevent.flight.unlink())./my/events/flight/<id>/remove, which checks that the flight belongs to the logged-in participant, as the other participant forms do since T3572.../tasks/<task>), which pointed to a page that doesn't exist from the flight pages. The task, "Fundraising tools" and "Edit profile" links are now absolute.Criminal record: moved by hand
Before, the registration moved to Criminal record by itself, which sent the criminal record request.
muskathlon18.0.1.1.6 andwebsite_switzerland18.0.1.0.17, since the stage data isnoupdate).Muskathlon tasks already done
A participant who signed the child protection charter for a group visit was asked to sign it again in the Muskathlon, and the charter page only showed "thank you" since the charter was already signed. When a task is created,
website_switzerlandticks the tasks whose information the participant already gave (account activated, charter signed, passport, flights, recent criminal record), but it only checked the group visit tasks. It now checks the Muskathlon tasks too."Propose sponsoring children" could not be previewed (compassion-modules)
The preview of a communication's mail template took the first communication found, whatever its rule. The group visit template "Propose sponsoring children" uses the trip of the communication's registration, so it failed on a communication of a partner (
'res.partner' object has no attribute 'compassion_event_id').Side finding, not changed: the English text of that template is in French.
Deployment
website_event_compassion,muskathlon,website_switzerland,report_compassionandpartner_communication.--i18n-overwriteonwebsite_switzerlandormuskathlon: their .po files still hold old mail bodies. A plain-uis safe.website_event_compassion18.0.1.6.6,muskathlon18.0.1.1.6 andwebsite_switzerland18.0.1.0.17 are new for stage.Testing
website_switzerlandTestParticipantAccess: flight pages per direction, a participant removes their flight, a participant cannot remove another participant's flight, connection flights kept.website_switzerlandTestMuskathlonJourney: the registration waits in Fill documents until moved by hand to Criminal record; a charter signed before is ticked when its task is created.website_switzerlandgroup visit journey: updated to wait in Trip paid. These tests already fail on stage without these changes (new registrations stay in Unconfirmed and never get the "Pay fees" task). This is not caused by this PR and is still to investigate.partner_communicationTestTemplatePreview: the preview uses a communication of the template's rule, and says when there is none.How to test on stage
🤖 Generated with Claude Code