Commit 5c433acd authored by grisel-davy's avatar grisel-davy Committed by Maël Kervella

bug fix historique alias

parent cc2dcefa
......@@ -110,6 +110,11 @@ class BanAdmin(VersionAdmin):
pass
class MailAliasAdmin(VersionAdmin):
"""Gestion des alias mail"""
pass
class WhitelistAdmin(VersionAdmin):
"""Gestion des whitelist"""
pass
......@@ -211,6 +216,7 @@ admin.site.register(School, SchoolAdmin)
admin.site.register(ListRight, ListRightAdmin)
admin.site.register(ListShell, ListShellAdmin)
admin.site.register(Ban, BanAdmin)
admin.site.register(MailAlias, MailAliasAdmin)
admin.site.register(Whitelist, WhitelistAdmin)
admin.site.register(Request, RequestAdmin)
# Now register the new UserAdmin...
......
......@@ -1677,7 +1677,7 @@ class MailAlias(RevMixin, AclMixin, models.Model):
"""
Define a alias for a user Mail
Définit un aliase pour un Mail d'utilisateur
Définit un alias pour un Mail d'utilisateur
"""
mail = models.ForeignKey(
'Mail',
......@@ -1713,7 +1713,7 @@ class MailAlias(RevMixin, AclMixin, models.Model):
def can_view(self, user_request, *_args, **_kwargs):
"""
Check if the user can view the aliases
Check if the user can view the alias
"""
if user_request.has_perm('users.view_mailalias') or user.request == self.user:
......
......@@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% can_edit alias %}
{% include 'buttons/edit.html' with href='users:edit-mailalias' id=alias.id %}
{% acl_end %}
{% include 'buttons/history.html' with href='users:history' name='alias' id=alias.id %}
{% include 'buttons/history.html' with href='users:history' name='mailalias' id=alias.id %}
</td>
</tr>
{% endfor %}
......
......@@ -447,7 +447,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% acl_end %}
{% if alias_list %}
{% include "users/aff_alias.html" with alias_list=alias_list %}
{% include "users/aff_mailalias.html" with alias_list=alias_list %}
{% endif %}
{% endif %}
{% else %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment