From 24316961ab58fc5c2c5d64adc9ef19b0d46bf259 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Sun, 31 May 2020 13:02:41 +0200 Subject: [PATCH] QS 0.9.1 Chat noch ein wenig verbessert --- chat/forms.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/chat/forms.py b/chat/forms.py index 192af0a..580c142 100644 --- a/chat/forms.py +++ b/chat/forms.py @@ -16,10 +16,9 @@ class ChatUpdateChatRoom(forms.ModelForm): fields = ['roomname', 'chatmembers', 'chatmembers_admin'] def __init__(self, *args, **kwargs): - print(kwargs) super(ChatUpdateChatRoom, self).__init__(*args, **kwargs) - self.fields['chatmembers'] = forms.MultipleChoiceField(required=True, label="Mitglieder", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].creator.profile.agency.pk).exclude(pk=kwargs["instance"].pk)], widget=forms.CheckboxSelectMultiple()) - self.fields['chatmembers_admin'] = forms.MultipleChoiceField(required=False, label="Raumverwalter", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].creator.profile.agency.pk).exclude(pk=kwargs["instance"].pk)], widget=forms.CheckboxSelectMultiple()) + self.fields['chatmembers'] = forms.MultipleChoiceField(required=True, label="Mitglieder", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].creator.profile.agency.pk)], widget=forms.CheckboxSelectMultiple()) + self.fields['chatmembers_admin'] = forms.MultipleChoiceField(required=False, label="Raumverwalter", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].creator.profile.agency.pk)], widget=forms.CheckboxSelectMultiple()) class ChatAddChatRoom(forms.ModelForm): @@ -35,5 +34,5 @@ class ChatAddChatRoom(forms.ModelForm): def __init__(self, *args, **kwargs): super(ChatAddChatRoom, self).__init__(*args, **kwargs) - self.fields['chatmembers'] = forms.MultipleChoiceField(required=True, label="Mitglieder", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].profile.agency.pk).exclude(pk=kwargs["instance"].pk)], widget=forms.CheckboxSelectMultiple()) - self.fields['chatmembers_admin'] = forms.MultipleChoiceField(required=False, label="Raumverwalter", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].profile.agency.pk).exclude(pk=kwargs["instance"].pk)], widget=forms.CheckboxSelectMultiple()) + self.fields['chatmembers'] = forms.MultipleChoiceField(required=True, label="Mitglieder", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].profile.agency.pk)], widget=forms.CheckboxSelectMultiple()) + self.fields['chatmembers_admin'] = forms.MultipleChoiceField(required=False, label="Raumverwalter", choices=[(u.id, u) for u in UserFullName.objects.filter(profile__agency__pk=kwargs["instance"].profile.agency.pk)], widget=forms.CheckboxSelectMultiple())