Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/redirect-url into lp://staging/canonical-identity-provider/release

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: no longer in the source branch.
Merged at revision: 126
Proposed branch: lp://staging/~canonical-isd-hackers/canonical-identity-provider/redirect-url
Merge into: lp://staging/canonical-identity-provider/release
Diff against target: 377 lines (+257/-28)
6 files modified
identityprovider/models/account.py (+13/-0)
identityprovider/templates/registration/logout.html (+45/-0)
identityprovider/tests/test_models_account.py (+23/-1)
identityprovider/tests/test_views_ui.py (+2/-6)
identityprovider/tests/test_views_ui_logout.py (+97/-0)
identityprovider/views/ui.py (+77/-21)
To merge this branch: bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/redirect-url
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski (community) Approve
Danny Tamez (community) Needs Fixing
Review via email: mp+36171@code.staging.launchpad.net

Commit message

Added return_to GET argument to /+logout, which enables people getting back to the original page from which they were logged out.

Description of the change

Added return_to GET argument to +logout view.

I created the view as class to easier handle logic in that view.

To post a comment you must log in.
Revision history for this message
Danny Tamez (zematynnad) wrote :

Looks great - just some nit picks...
typo on line 12 of the diff withing
is the test_test_ thing on lines 181 and 185 on purpose?
please put line 259 after 261 and remove the unused import on line 11 of identityprovider/views/ui.py

review: Needs Fixing
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Approving after David applied requested changes.

review: Approve
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/redirect-url into lp:canonical-identity-provider failed due to merge conflicts:

text conflict in identityprovider/views/ui.py

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Approving after resolving merge conflicts.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.