public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Consolidate forms for task creation and editing

Browse source
This commit is contained in:
Scot Hacker 2018-03-24 12:24:49 -07:00
parent bc8adb63f5
commit 07e02b56f7
6 changed files with 128 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

23
todo/forms.py
View file

@ -19,16 +19,17 @@ class AddTaskListForm(ModelForm):
exclude = []
class AddItemForm(ModelForm):
class AddEditItemForm(ModelForm):
"""The picklist showing the users to which a new task can be assigned
must find other members of the groups the current list belongs to."""
def __init__(self, task_list, *args, **kwargs):
def __init__(self, user, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['assigned_to'].queryset = get_user_model().objects.filter(groups__in=[task_list.group])
self.fields['assigned_to'].queryset = get_user_model().objects.filter(groups__in=user.groups.all())
self.fields['assigned_to'].label_from_instance = lambda obj: "%s (%s)" % (obj.get_full_name(), obj.username)
self.fields['assigned_to'].widget.attrs = {
'id': 'id_assigned_to', 'class': "custom-select mb-3", 'name': 'assigned_to'}
self.fields['task_list'].value = kwargs['initial']['task_list'].id
due_date = forms.DateField(
widget=forms.DateInput(attrs={'type': 'date'}), required=False)
@ -44,22 +45,6 @@ class AddItemForm(ModelForm):
exclude = []
class EditItemForm(ModelForm):
"""The picklist showing the users to which a new task can be assigned
must find other members of the groups the current list belongs to."""
def __init__(self, *args, **kwargs):
super(EditItemForm, self).__init__(*args, **kwargs)
self.fields['assigned_to'].queryset = get_user_model().objects.filter(
groups__in=[self.instance.task_list.group])
due_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}), required=False)
class Meta:
model = Item
exclude = ('created_date', 'created_by',)
class AddExternalItemForm(ModelForm):
"""Form to allow users who are not part of the GTD system to file a ticket."""