Commit a02db154 authored by klafyvel's avatar klafyvel

Merge branch 'change_self_shell' into 'dev'

users can change their shell

See merge request federez/re2o!255
parents 65fed745 1e47fa16
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-08-13 17:18
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('preferences', '0048_auto_20180811_1515'),
]
operations = [
migrations.AddField(
model_name='optionaluser',
name='self_change_shell',
field=models.BooleanField(default=False, help_text='Users can change their shell'),
),
]
......@@ -85,6 +85,10 @@ class OptionalUser(AclMixin, PreferencesModel):
blank=True,
null=True
)
self_change_shell = models.BooleanField(
default=False,
help_text="Users can change their shell"
)
local_email_accounts_enabled = models.BooleanField(
default=False,
help_text="Enable local email accounts for users"
......
......@@ -45,10 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ useroptions.self_adhesion|tick }}</td>
</tr>
<tr>
<th>Champ gpg fingerprint</th>
<td>{{ useroptions.gpg_fingerprint|tick }}</td>
<th>Shell par défaut des utilisateurs</th>
<td>{{ useroptions.shell_default }}</td>
<th>Les utilisateurs peuvent changer leur shell</th>
<td>{{ useroptions.self_change_shell|tick }}</td>
</tr>
<tr>
<th>Creations d'adhérents par tous</th>
......@@ -56,6 +57,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Creations de clubs par tous</th>
<td>{{ useroptions.all_can_create_club|tick }}</td>
</tr>
<tr>
<th>Champ gpg fingerprint</th>
<td>{{ useroptions.gpg_fingerprint|tick }}</td>
</tr>
</table>
<h5>Comptes mails</h5>
......
......@@ -832,18 +832,18 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
"Droit requis pour changer l'état"
)
@staticmethod
def can_change_shell(user_request, *_args, **_kwargs):
def can_change_shell(self, user_request, *_args, **_kwargs):
""" Check if a user can change a shell
:param user_request: The user who request
:returns: a message and a boolean which is True if the user has
the right to change a shell
"""
return (
user_request.has_perm('users.change_user_shell'),
"Droit requis pour changer le shell"
)
if not ((self.pk == user_request.pk and OptionalUser.get_cached_value('self_change_shell'))
or user_request.has_perm('users.change_user_shell')):
return False, u"Droit requis pour changer le shell"
else:
return True, None
@staticmethod
def can_change_local_email_redirect(user_request, *_args, **_kwargs):
......
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