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

Fix permission check

Browse source
This commit is contained in:
Gabriel Detraz 2020-04-23 12:59:38 +02:00
parent bcb9e097ac
commit 69c924014f
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
users/migrations/0091_auto_20200423_1256.py Normal file
View file

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.28 on 2020-04-23 10:56
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('users', '0090_auto_20200421_1825'),
]
operations = [
migrations.AlterModelOptions(
name='user',
options={'permissions': (('change_user_password', 'Can change the password of a user'), ('change_user_state', 'Can edit the state of a user'), ('change_user_force', 'Can force the move'), ('change_user_shell', 'Can edit the shell of a user'), ('change_user_pseudo', 'Can edit the pseudo of a user'), ('change_user_groups', 'Can edit the groups of rights of a user (critical permission)'), ('change_all_users', 'Can edit all users, including those with rights'), ('view_user', 'Can view a user object')), 'verbose_name': 'user (member or club)', 'verbose_name_plural': 'users (members or clubs)'},
),
]

7
users/models.py
View file

@ -252,6 +252,7 @@ class User(
("change_user_state", _("Can edit the state of a user")), ("change_user_state", _("Can edit the state of a user")),
("change_user_force", _("Can force the move")), ("change_user_force", _("Can force the move")),
("change_user_shell", _("Can edit the shell of a user")), ("change_user_shell", _("Can edit the shell of a user")),
("change_user_pseudo", _("Can edit the pseudo of a user")),
( (
"change_user_groups", "change_user_groups",
_("Can edit the groups of rights of a user (critical permission)"), _("Can edit the groups of rights of a user (critical permission)"),
@ -1180,12 +1181,12 @@ class User(
self.pk == user_request.pk self.pk == user_request.pk
and OptionalUser.get_cached_value("self_change_pseudo") and OptionalUser.get_cached_value("self_change_pseudo")
) )
or user_request.has_perm("users.change_user_shell") or user_request.has_perm("users.change_user_pseudo")
): ):
return ( return (
False, False,
_("You don't have the right to change the shell."), _("You don't have the right to change the pseudo."),
("users.change_user_shell",), ("users.change_user_pseudo",),
) )
else: else:
return True, None, None return True, None, None