ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 01:48:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'fix_distinct'

Browse Source 
# Conflicts:
#   apps/activity/views.py
This commit is contained in:
Pierre-antoine Comby
2020-04-09 22:30:19 +02:00
parent 9fbfac7bdb 0e082995e3
commit 68808ddece
54 changed files with 2698 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

703
apps/permission/fixtures/initial.json
View File

File diff suppressed because it is too large Load Diff

10
apps/permission/models.py
View File

@ -106,6 +106,10 @@ class PermissionMask(models.Model):
def __str__(self):
return self.description
class Meta:
verbose_name = _("permission mask")
verbose_name_plural = _("permission masks")
class Permission(models.Model):
@ -153,6 +157,8 @@ class Permission(models.Model):
class Meta:
unique_together = ('model', 'query', 'type', 'field')
verbose_name = _("permission")
verbose_name_plural = _("permissions")
def clean(self):
self.query = json.dumps(json.loads(self.query))
@ -293,3 +299,7 @@ class RolePermissions(models.Model):
def __str__(self):
return str(self.role)
class Meta:
verbose_name = _("role permissions")
verbose_name_plural = _("role permissions")