Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into oauth_redirect

Browse source 
# Conflicts:
#	realms/modules/auth/views.py
This commit is contained in:
Chase Sterling 2016-09-04 12:25:57 -04:00
commit 2ce6c2d314
41 changed files with 350 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
realms/templates/layout.html
View file

@ -58,7 +58,7 @@
</div>
</form>
</li>
{% if current_user.is_authenticated() %}
{% if current_user.is_authenticated %}
<li class="dropdown user-avatar">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<span>
@ -109,7 +109,7 @@
{% endfor %}
var User = {};
User.is_authenticated = {{ current_user.is_authenticated()|tojson }};
User.is_authenticated = {{ current_user.is_authenticated|tojson }};
{% for attr in ['username', 'email'] %}
User.{{ attr }} = {{ current_user[attr]|tojson }};
{% endfor %}