rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 04:43:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-club-edit-acl' into 'dev'

Browse source 
Fix club edit and add some documentation on that error.

See merge request re2o/re2o!580
This commit is contained in:
chirac 2020-12-28 20:54:42 +01:00
commit 3459994754
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
re2o/acl.py
View file

@ -64,11 +64,17 @@ def acl_base_decorator(method_name, *targets, on_instance=True):
"""Base decorator for acl. It checks if the `request.user` has the """Base decorator for acl. It checks if the `request.user` has the
permission by calling model.method_name. If the flag on_instance is True, permission by calling model.method_name. If the flag on_instance is True,
tries to get an instance of the model by calling tries to get an instance of the model by calling
`model.get_instance(*args, **kwargs)` and runs `instance.mehod_name` `model.get_instance(obj_id, *args, **kwargs)` and runs `instance.mehod_name`
rather than model.method_name. rather than model.method_name.
It is not intended to be used as is. It is a base for others ACL It is not intended to be used as is. It is a base for others ACL
decorators. decorators. Beware, if you redefine the `get_instance` method for your
model, give it a signature such as
`def get_instance(cls, object_id, *_args, **_kwargs)`, because you will
likely have an url with a named parameter "userid" if *e.g.* your model
is an user. Otherwise, if the parameter name in `get_instance` was also
`userid`, then `get_instance` would end up having two identical parameter
passed on, and this would result in a `TypeError` exception.
Args: Args:
method_name: The name of the method which is to to be used for ACL. method_name: The name of the method which is to to be used for ACL.

10
users/models.py
View file

@ -2027,10 +2027,10 @@ class Adherent(User):
self.gpg_fingerprint = gpg_fingerprint self.gpg_fingerprint = gpg_fingerprint
@classmethod @classmethod
def get_instance(cls, adherentid, *_args, **_kwargs): def get_instance(cls, object_id, *_args, **_kwargs):
"""Try to find an instance of `Adherent` with the given id. """Try to find an instance of `Adherent` with the given id.
:param adherentid: The id of the adherent we are looking for. :param object_id: The id of the adherent we are looking for.
:return: An adherent. :return: An adherent.
""" """
@ -2154,13 +2154,13 @@ class Club(User):
) )
@classmethod @classmethod
def get_instance(cls, clubid, *_args, **_kwargs): def get_instance(cls, object_id, *_args, **_kwargs):
"""Try to find an instance of `Club` with the given id. """Try to find an instance of `Club` with the given id.
:param clubid: The id of the adherent we are looking for. :param object_id: The id of the adherent we are looking for.
:return: A club. :return: A club.
""" """
return cls.objects.get(pk=clubid) return cls.objects.get(pk=object_id)
@receiver(post_save, sender=Adherent) @receiver(post_save, sender=Adherent)