stable
Clone or download
Follow-up to git #tuleap/stable/2e0e44a2434c5f2d50ac2cc432019c5f9d74993a When a user register a new account but account creation needs site admin approval, then the confirmation page is now displayed with BurningParrot. When a site admin creates a user, then the confirmation page is now displayed with BurningParrot. This contribution only targets the steps "M" and "R" in the flow chart below. ```mermaid graph TD A[Register] --> B{Captcha <br>ok?} B -->|no| F B -->|yes| D(Create account) D --> E{Account <br>created?} E -->|no| F[Errors!] E -->|yes| G(OIDC link registering account) F --> H[fa:fa-star Display register form] H --> A G --> I{User created <br> by site admin?} I -->|yes| J{Should send <br>an email?} J -->|no| R J -->|yes| K(Send email to user with login and pwd fa:fa-bomb) I -->|no| L{sys_user_approval = 0?} L -->|no| M[fa:fa-star Your account has been created<br>it must be approved by an administrator<br>Once approved clic the confirm button in this email] L -->|yes| Q(Send confirmation email fa:fa-bomb) Q --> O[fa:fa-star Your account is created, </br>it now needs to be activated.<br>To do this clic the confirm button in the email] K --> R[fa:fa-star The user account was created.<br>Please note the login and pwd] style H fill:#ffe5e5,stroke:#f02727,color:#b70d0d style R fill:#f4f8e9,stroke:#6abf1d,color:#137900 style M fill:#f4f8e9,stroke:#6abf1d,color:#137900 style O fill:#f4f8e9,stroke:#6abf1d,color:#137900 ``` Implementation notes: For now code is kept in register.php but once other pages will be converted to BurningParrot, they will be moved in a dedicated DispatchableWithBurningParrot controller. Previous confirmation page will be removed alongside register.php cleanup in a dedicated contribution. Part of request #29605: Convert account registration pages to BurningParrot Change-Id: Ifbad96c5d301ad0cb491554afbd6869601a023fc
Modified Files
Name | ||||
---|---|---|---|---|
M | site-content/fr_FR/LC_MESSAGES/tuleap-core.po | +27 | −25 | Go to diff View file |
M | site-content/pt_BR/LC_MESSAGES/tuleap-core.po | +23 | −23 | Go to diff View file |
A | src/templates/account/create/confirmation-admin-creation.mustache | +34 | −0 | Go to diff View file |
M | src/templates/account/create/confirmation-link-sent.mustache | +1 | −1 | Go to diff View file |
A | src/templates/account/create/waiting-for-approval.mustache | +38 | −0 | Go to diff View file |
M | src/themes/BurningParrot/css/account-registration/account-registration.scss | +11 | −0 | Go to diff View file |
M | src/www/account/register.php | +54 | −37 | Go to diff View file |