rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-01 17:12:26 +00:00
Code Issues Releases Wiki Activity

fichiers oubliés

Browse source
This commit is contained in:
grisel-davy 2018-07-01 15:33:16 +02:00
parent 115c91caad
commit 8d86feab0f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
templates/base.html
View file

@ -130,8 +130,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a> </a>
</li> </li>
{% acl_end %} {% acl_end %}
<li> <li class="dropdown">
<a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fas fa-info"></i> {% trans "Info" %}<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a></li>
<li><a href="{% url 'contact' %}"><i class="fas fa-at"></i> {% trans "Contact" %}</a></li>
</ul>
</li> </li>
{% if not request.user.is_authenticated %} {% if not request.user.is_authenticated %}
{% if var_sa %} {% if var_sa %}

4
users/models.py
View file

@ -1649,6 +1649,10 @@ class MailAlias(RevMixin, AclMixin, models.Model):
) )
def __str__(self): def __str__(self):
return self.complete_mail
@cached_property
def complete_mail(self):
return self.valeur + OptionalUser.get_cached_value('mail_extension') return self.valeur + OptionalUser.get_cached_value('mail_extension')
@staticmethod @staticmethod