UX/UI fixes #11
Merged
UX/UI fixes #11
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
ThiefMaster
reviewed
Jun 27, 2017
cephalopod/factory.py
Outdated
| @@ -42,7 +42,6 @@ def make_app(): | |||
| 'SQLALCHEMY_TRACK_MODIFICATIONS': False, | |||
| 'MULTIPASS_LOGIN_SELECTOR_TEMPLATE': 'login_selector.html', | |||
| 'MULTIPASS_LOGIN_FORM_TEMPLATE': 'login_form.html', | |||
| 'MULTIPASS_SUCCESS_ENDPOINT': 'auth.index' | |||
There was a problem hiding this comment.
this should stay. see the logic in multipass to get the next url:
try:
return session.pop('_multipass_next_url')
except KeyError:
return url_for(current_app.config['MULTIPASS_SUCCESS_ENDPOINT'])
mvidalgarcia
force-pushed
the
ux-ui-fixes
branch
from
0f5acf4
to
d382eac
Compare
ThiefMaster
approved these changes
Jun 27, 2017
cephalopod/webinterface/frontend.py
Outdated
| @@ -33,7 +33,8 @@ def get_server_fields(server): | |||
| def login_required(): | |||
| whitelist = current_app.config['USER_WHITELIST'] | |||
| if 'user' not in session or session['user'] not in whitelist.get(session.get('provider'), set()): | |||
| return multipass.logout(url_for('auth.login'), clear_session=True) | |||
| next_url = request.full_path | |||
There was a problem hiding this comment.
I'd use request.full_path.rstrip('?') to get rid of the ugly trailing ? if there's no query string
nop33
approved these changes
Jun 27, 2017
.. instead of index page.
In case of not successful login, redirect to index and improve message.
mvidalgarcia
force-pushed
the
ux-ui-fixes
branch
from
d382eac
to
b6ab352
Compare
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.