Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

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:

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()