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

Jump to bottom

Adx 1009 APE Integration into ADR #292

Merged
merged 9 commits into from
Aug 7, 2023
Merged

Adx 1009 APE Integration into ADR #292

merged 9 commits into from
Aug 7, 2023

Conversation

A-Souhei
Copy link
Contributor

@A-Souhei A-Souhei commented Jul 27, 2023 •
edited
Loading

Description

  • Redirection from APE back to ADR ape_data_receiver endpoint after user clicks on "Update" button
  • Redirection from ape_data_receiver to ADR user.edit with flash message indicating the need to log in again if wishing to see the changes in the UI
  • HIV Tools profile data in ADR user.edit have been reorganised (UI change)

image
image

Checklist

Put an x in the boxes that apply to this pull request (you can also fill these out after opening the pull request).
You may not need to check all boxes.

  • The Jira ticket for this issue has been updated to "Ready to Review" or equivalent.
  • I have developed these changes in discussion with the appropriate project manager.
  • My code follows the general Fjelltopp documentation (see Confluence).
  • I have made corresponding changes to the Fjelltopp documentation (see Confluence).
  • I have rebased this branch with master.
  • New dependency changes have been committed.
  • I have added automated tests that prove my fix is effective or that my feature works.
  • New and existing tests pass locally with my changes.
  • My changes generate no new warnings.
  • I have performed a self-review of my own code.
  • I have assigned at least one reviewer.

kforenc and others added 8 commits July 17, 2023 10:54
@kforenc
ADX-1009 Allow navigating to APE app from ADR with a link to bo back
36cba3f
@kforenc
ADX-1009 Babelize message
afa5805
@kforenc
ADX-1009 French translation
6666bbd
@kforenc
ADX-1009 Show link to edit user profile only on own page
4b0c7c5
@kforenc
ADX-1009 Translate messages to fr and pt_PT; translate missing messag…
447b84b 
…es to pt_PT using Google Translate
@kforenc
ADX-1009 CR fixes
d744b08
@A-Souhei
Adx 1023 adr UI changes and flash message for ape update (#291)
27dbf4b 
* Adx 1023 flash message (#289)

* ADX-1023 edited edit_user_form.html

* ADX-1023 added blueprint

* ADX-1023 added blueprint

---------

Co-authored-by: toavina <[email protected]>

* ADX-1023 ui changes (#290)

Co-authored-by: toavina <[email protected]>

* ADX-1023 updating translations

* ADX-1023 updating translations (po)

* ADX-1023 updating translations (po no fuzzy)

* ADX-1023 updating translations (mo files)

---------

Co-authored-by: toavina <[email protected]>
ADX-1009 removing 2 extra lines
23fb4bf
@A-Souhei A-Souhei marked this pull request as ready for review July 27, 2023 12:42
kforenc
kforenc approved these changes Aug 7, 2023
View reviewed changes
Copy link
Contributor

@kforenc kforenc left a comment

Choose a reason for hiding this comment

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

Everything good. Nice job!

@kforenc kforenc merged commit fdce51e into development Aug 7, 2023
3 of 4 checks passed
@kforenc kforenc deleted the ADX-1009_seamless_integration_with_adr branch August 7, 2023 11:45
@tomeksabala tomeksabala removed their request for review August 9, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kforenc kforenc kforenc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@A-Souhei @kforenc