klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-07-01 02:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Skia 2016-09-01 16:43:21 +02:00
parent f7e3251ae5
commit d27f62dca9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/core/user_base.jinja
View File

@ -11,11 +11,13 @@
{%- endif -%} {%- endif -%}
>{% trans %}Infos{% endtrans %}</a> >{% trans %}Infos{% endtrans %}</a>
{% if profile == user %}
<a href="{{ url('core:user_tools') }}" <a href="{{ url('core:user_tools') }}"
{%- if tab == "tools" -%} {%- if tab == "tools" -%}
class="selected_tab" class="selected_tab"
{%- endif -%} {%- endif -%}
>{% trans %}Tools{% endtrans %}</a> >{% trans %}Tools{% endtrans %}</a>
{% endif %}
<a href="{{ url('core:user_stats', user_id=profile.id) }}" <a href="{{ url('core:user_stats', user_id=profile.id) }}"
{%- if tab == "stats" -%} {%- if tab == "stats" -%}

3
core/views/forms.py
View File

@ -81,7 +81,8 @@ class LoginForm(AuthenticationForm):
user = User.objects.filter(email=data['username']).first() user = User.objects.filter(email=data['username']).first()
else: else:
user = User.objects.filter(username=data['username']).first() user = User.objects.filter(username=data['username']).first()
data['username'] = user.username if user:
data['username'] = user.username
kwargs['data'] = data kwargs['data'] = data
super(LoginForm, self).__init__(*arg, **kwargs) super(LoginForm, self).__init__(*arg, **kwargs)
self.fields['username'].label = _("Username, email, or account number") self.fields['username'].label = _("Username, email, or account number")