From e6ba6cfbe7465737fe375db20d20796873b930e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?= =?UTF-8?q?=D0=BA?= Date: Fri, 23 Jan 2015 14:27:37 +0200 Subject: [PATCH] Tag form bug --- company/edit_forms.py | 13 +++++++++++++ company/views.py | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/company/edit_forms.py b/company/edit_forms.py index 0738c0ec..ee64574a 100644 --- a/company/edit_forms.py +++ b/company/edit_forms.py @@ -113,6 +113,19 @@ class TagForm(BaseForm): model = Company fields = ('tag',) + def clean_tag(self): + tags = self.cleaned_data.get('tag') + if tags: + res = [] + for id in tags.split(', '): + try: + res.append(int(id)) + except: + continue + return res + else: + return [] + class FoundationForm(BaseForm): class Meta: diff --git a/company/views.py b/company/views.py index a7e82a64..f55873d8 100644 --- a/company/views.py +++ b/company/views.py @@ -112,9 +112,10 @@ class MemberDetail(DetailView): 'staff_form': CompStaff(instance=company), 'found_form': CompFound(instance=company), 'logo_form': CompLogo(instance=company) } - tags = [{'id': tag.id, 'text': tag.name } for tag in company.tag.all()] + tags = [{'id': str(tag.id), 'text': tag.name } for tag in company.tag.all()] tag_form = CompTagForm(instance=company) tag_form.fields['tag'].widget.attrs['data-predifined'] = json.dumps(tags) + tag_form.fields['tag'].widget.attrs['value'] = '' forms.update({'tag_form': tag_form}) lang = get_language()