fixed NoteMixin
This commit is contained in:
@@ -38,7 +38,8 @@ class UserNoteForm(NoteForm):
|
||||
class Meta(NoteForm.Meta):
|
||||
fields = ['sujet', 'text', 'created_date', 'created_time']
|
||||
|
||||
def __init__(self, request, **kwargs):
|
||||
def __init__(self, **kwargs):
|
||||
request = kwargs.pop('request')
|
||||
super().__init__(**kwargs)
|
||||
try:
|
||||
self.author = Professionnel.objects.get(pk=request.user.pk)
|
||||
@@ -47,7 +48,6 @@ class UserNoteForm(NoteForm):
|
||||
raise RuntimeError(msg)
|
||||
|
||||
def save(self, commit=True):
|
||||
print('save UserNote', self)
|
||||
instance = super().save(commit=False)
|
||||
instance.created_by = self.author
|
||||
if commit:
|
||||
@@ -58,12 +58,11 @@ class AutoNoteForm(UserNoteForm):
|
||||
class Meta(UserNoteForm.Meta):
|
||||
fields = ['text']
|
||||
|
||||
def __init__(self, request, **kwargs):
|
||||
def __init__(self, **kwargs):
|
||||
self.sujet = kwargs.pop('sujet')
|
||||
super().__init__(request, **kwargs)
|
||||
super().__init__(**kwargs)
|
||||
|
||||
def save(self, commit=True):
|
||||
print('Saving : ', self, 'with', self.sujet)
|
||||
inst = super().save(commit=False)
|
||||
inst.sujet = self.sujet
|
||||
if commit:
|
||||
|
||||
@@ -7,21 +7,12 @@ class NoteFormMixin(FormMixin):
|
||||
|
||||
forms = None
|
||||
|
||||
def get_form(self, prefix, form_class=None):
|
||||
def get_form(self, prefix):
|
||||
kwargs = self.get_form_kwargs()
|
||||
kwargs['prefix'] = prefix
|
||||
if not form_class:
|
||||
kwargs['request'] = self.request
|
||||
form_class = self.forms[prefix]
|
||||
try:
|
||||
form = form_class(
|
||||
**kwargs
|
||||
)
|
||||
except TypeError: #Forms that requires request
|
||||
form = form_class(
|
||||
self.request,
|
||||
**kwargs
|
||||
)
|
||||
return form
|
||||
return form_class(**kwargs)
|
||||
|
||||
def post(self, request, **kwargs):
|
||||
for prefix in self.forms.keys():
|
||||
|
||||
Reference in New Issue
Block a user