Browse Source

Forbid user from forcing out another user with a free access

user_force_move_disabled_user_room
Jean-Romain Garnier 6 years ago
committed by chirac
parent
commit
86813b1a47
  1. 20
      preferences/migrations/0069_auto_20200415_2012.py
  2. 2
      users/forms.py

20
preferences/migrations/0069_auto_20200415_2012.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.28 on 2020-04-15 18:12
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('preferences', '0068_optionaluser_self_force_move_disabled_user_room'),
]
operations = [
migrations.AlterField(
model_name='optionaluser',
name='self_force_move_disabled_user_room',
field=models.BooleanField(default=False, help_text='Users can select a room occupied by a user with a disabled connection.'),
),
]

2
users/forms.py

@ -366,7 +366,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
# If a user already is register for this room
# but their connection has expired, allow force move
user = Adherent.objects.get(room=room)
if user and not user.is_connected():
if user and not user.has_access():
remove_user_room(room)
except Adherent.DoesNotExist:
pass

Loading…
Cancel
Save