ynerant/plateforme-corres2math
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git synced 2025-07-03 21:22:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'improvements'

Browse Source 
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
This commit is contained in:
Yohann D'ANELLO
2020-11-16 11:01:19 +00:00
parent ace1dbdc75 731f8711ff
commit 982b61fe03
15 changed files with 138 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corres2math/matrix.py
View File

@ -216,7 +216,7 @@ class Matrix:
"""
client = await cls._get_client()
resp = await client.room_resolve_alias(room_alias)
return resp.room_id if resp else None
return resp.room_id if resp and hasattr(resp, "room_id") else None
@classmethod
@async_to_sync

10
corres2math/templates/base.html
View File

@ -1,4 +1,4 @@
{% load static i18n static %}
{% load static i18n static calendar %}
<!DOCTYPE html>
{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
@ -126,9 +126,11 @@
</li>
{% endif %}
{% if not user.is_authenticated %}
<li class="nav-item active">
<a class="nav-link" href="{% url "registration:signup" %}"><i class="fas fa-user-plus"></i> {% trans "Register" %}</a>
</li>
{% if 1|current_phase %}
<li class="nav-item active">
<a class="nav-link" href="{% url "registration:signup" %}"><i class="fas fa-user-plus"></i> {% trans "Register" %}</a>
</li>
{% endif %}
<li class="nav-item active">
<a class="nav-link" href="#" data-toggle="modal" data-target="#loginModal">
<i class="fas fa-sign-in-alt"></i> {% trans "Log in" %}