rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
Gabriel Detraz 2020-03-29 01:24:22 +01:00 committed by root
commit dcb51bf267
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pip_requirements.txt
View file

@ -1,2 +1,2 @@
django-bootstrap3 django-bootstrap3==11.1.0
django-macaddress django-macaddress

4
tickets/models.py
View file

@ -74,13 +74,13 @@ class Ticket(AclMixin, models.Model):
""" Check that the user has the right to view the ticket """ Check that the user has the right to view the ticket
or that it is the author""" or that it is the author"""
if ( if (
not user_request.has_perm("tickets.view_ticket") not user_request.has_perm("tickets.view_tickets")
and self.user != user_request and self.user != user_request
): ):
return ( return (
False, False,
_("You don't have the right to view other tickets than yours."), _("You don't have the right to view other tickets than yours."),
("tickets.view_ticket",), ("tickets.view_tickets",),
) )
else: else:
return True, None, None return True, None, None