cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed plan share space filter

Browse Source
This commit is contained in:
vabene1111 2021-11-05 19:42:41 +01:00
parent fb018ef9e2
commit dda2529f6f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/forms.py
View File

@ -36,6 +36,11 @@ class DateWidget(forms.DateInput):
class UserPreferenceForm(forms.ModelForm): class UserPreferenceForm(forms.ModelForm):
prefix = 'preference' prefix = 'preference'
def __init__(self, *args, **kwargs):
space = kwargs.pop('space')
super().__init__(*args, **kwargs)
self.fields['plan_share'].queryset = User.objects.filter(userpreference__space=space).all()
class Meta: class Meta:
model = UserPreference model = UserPreference
fields = ( fields = (

6
cookbook/views/views.py
View File

@ -287,7 +287,7 @@ def user_settings(request):
if request.method == "POST": if request.method == "POST":
if 'preference_form' in request.POST: if 'preference_form' in request.POST:
active_tab = 'preferences' active_tab = 'preferences'
form = UserPreferenceForm(request.POST, prefix='preference') form = UserPreferenceForm(request.POST, prefix='preference', space=request.space)
if form.is_valid(): if form.is_valid():
if not up: if not up:
up = UserPreference(user=request.user) up = UserPreference(user=request.user)
@ -380,9 +380,9 @@ def user_settings(request):
sp.save() sp.save()
if up: if up:
preference_form = UserPreferenceForm(instance=up) preference_form = UserPreferenceForm(instance=up, space=request.space)
else: else:
preference_form = UserPreferenceForm() preference_form = UserPreferenceForm( space=request.space)
fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len( fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len(
sp.fulltext.all()) sp.fulltext.all())