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

company/edit_forms.py

@@ -117,7 +117,7 @@ class TagForm(BaseForm):
         tags = self.cleaned_data.get('tag')
         if tags:
             res = []
-            for id in tags.split(', '):
+            for id in tags.split(','):
                 try:
                     res.append(int(id))
                 except:

company/edit_views.py

@@ -38,7 +38,14 @@ class LogoView(BaseView):
     form_class = LogoForm
 
     def form_valid(self, form):
-        company = self.request.user.company
+        #company = self.request.user.company#!!!
+
+        slug = self.kwargs.get('slug')
+        if not slug:
+            raise Http404
+        company = Company.objects.get(url=slug)
+        if company.creator_id != self.request.user.id:
+            return HttpResponseForbidden()
         form = self.form_class(self.request.POST, self.request.FILES, instance=company)
         form.save()
         if self.request.is_ajax():

company/views.py

@@ -113,7 +113,7 @@ class MemberDetail(DetailView):
                 'logo_form': CompLogo(instance=company)
             }
             tags = [{'id': str(tag.id), 'text': tag.name } for tag in company.tag.all()]
-            tag_form =  CompTagForm(instance=company)
+            tag_form =  CompTagForm()
             tag_form.fields['tag'].widget.attrs['data-predifined'] = json.dumps(tags)
             tag_form.fields['tag'].widget.attrs['value'] = ''
             forms.update({'tag_form': tag_form})

templates/client/includes/company/company_edit.html

@@ -30,12 +30,12 @@
 								<div class="ef-body">
 
 									<div class="epfl">
-										<label>{{ avatar_form.avatar.label }}</label>
+										<label>{{ logo_form.logo.label }}</label>
 										<div class="epf-field">
 											<div class="input-file clearfix">
 												<div class="button icon-clip">{% trans 'выберите файл' %}</div>
 												<div class="file-text placehlder">{% trans 'Файл не выбран' %}</div>
-												<div class="if-field-wrap"><input id="id_avatar" type="file" name="avatar" /></div>
+												<div class="if-field-wrap"><input id="id_logo" type="file" name="logo" /></div>
 											</div>
 										</div>
 									</div>