python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed NoteMixin

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-09-08 11:30:42 +02:00
parent 4ce0baffed
commit ec7f085b8e
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
notes/forms.py
View File

@@ -38,7 +38,8 @@ class UserNoteForm(NoteForm):
class Meta(NoteForm.Meta): class Meta(NoteForm.Meta):
fields = ['sujet', 'text', 'created_date', 'created_time'] fields = ['sujet', 'text', 'created_date', 'created_time']
def __init__(self, request, **kwargs): def __init__(self, **kwargs):
request = kwargs.pop('request')
super().__init__(**kwargs) super().__init__(**kwargs)
try: try:
self.author = Professionnel.objects.get(pk=request.user.pk) self.author = Professionnel.objects.get(pk=request.user.pk)
@@ -47,7 +48,6 @@ class UserNoteForm(NoteForm):
raise RuntimeError(msg) raise RuntimeError(msg)
def save(self, commit=True): def save(self, commit=True):
print('save UserNote', self)
instance = super().save(commit=False) instance = super().save(commit=False)
instance.created_by = self.author instance.created_by = self.author
if commit: if commit:
@@ -58,12 +58,11 @@ class AutoNoteForm(UserNoteForm):
class Meta(UserNoteForm.Meta): class Meta(UserNoteForm.Meta):
fields = ['text'] fields = ['text']
def __init__(self, request, **kwargs): def __init__(self, **kwargs):
self.sujet = kwargs.pop('sujet') self.sujet = kwargs.pop('sujet')
super().__init__(request, **kwargs) super().__init__(**kwargs)
def save(self, commit=True): def save(self, commit=True):
print('Saving : ', self, 'with', self.sujet)
inst = super().save(commit=False) inst = super().save(commit=False)
inst.sujet = self.sujet inst.sujet = self.sujet
if commit: if commit:

15
notes/mixins.py
View File

@@ -7,21 +7,12 @@ class NoteFormMixin(FormMixin):
forms = None forms = None
def get_form(self, prefix, form_class=None): def get_form(self, prefix):
kwargs = self.get_form_kwargs() kwargs = self.get_form_kwargs()
kwargs['prefix'] = prefix kwargs['prefix'] = prefix
if not form_class: kwargs['request'] = self.request
form_class = self.forms[prefix] form_class = self.forms[prefix]
try: return form_class(**kwargs)
form = form_class(
**kwargs
)
except TypeError: #Forms that requires request
form = form_class(
self.request,
**kwargs
)
return form
def post(self, request, **kwargs): def post(self, request, **kwargs):
for prefix in self.forms.keys(): for prefix in self.forms.keys():