Fixes.

[wolnelektury.git] / src / social / forms.py

diff --git a/src/social/forms.py b/src/social/forms.py
old mode 100755 (executable)
new mode 100644 (file)
index 5834ffa..5c0973c
--- a/src/social/forms.py
+++ b/src/social/forms.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -14,8 +13,7 @@ class UserSetsForm(forms.Form):
     def __init__(self, book, user, *args, **kwargs):
         super(UserSetsForm, self).__init__(*args, **kwargs)
         self.fields['set_ids'] = forms.ChoiceField(
     def __init__(self, book, user, *args, **kwargs):
         super(UserSetsForm, self).__init__(*args, **kwargs)
         self.fields['set_ids'] = forms.ChoiceField(

-            choices=[(tag.id, tag.name) for tag in
-                Tag.objects.filter(category='set', user=user).iterator()],
+            choices=[(tag.id, tag.name) for tag in Tag.objects.filter(category='set', user=user).iterator()],

         )
 
 
         )
 
 


@@ -27,14 +25,13 @@ class ObjectSetsForm(forms.Form):
         self._obj = obj
         self._user = user
         data = kwargs.setdefault('data', {})
         self._obj = obj
         self._user = user
         data = kwargs.setdefault('data', {})

-        if 'tags' not in data and user.is_authenticated():
-            data['tags'] = ', '.join(t.name
-                for t in obj.tags.filter(category='set', user=user).iterator() if t.name)
+        if 'tags' not in data and user.is_authenticated:
+            data['tags'] = ', '.join(
+                obj.tags.filter(category='set', user=user).exclude(name__in=(None, '')).values_list('name', flat=True))

         super(ObjectSetsForm, self).__init__(*args, **kwargs)
 
     def save(self, request):
         super(ObjectSetsForm, self).__init__(*args, **kwargs)
 
     def save(self, request):

-        tags = [get_set(self._user, tag_name.strip())
-                    for tag_name in self.cleaned_data['tags'].split(',')]
+        tags = [get_set(self._user, tag_name.strip()) for tag_name in self.cleaned_data['tags'].split(',')]

         set_sets(self._user, self._obj, tags)
         return {"like": True}
 
         set_sets(self._user, self._obj, tags)
         return {"like": True}
 


@@ -48,8 +45,7 @@ class NewSetForm(forms.Form):
 
     def save(self, user, commit=True):
         name = self.cleaned_data['name']
 
     def save(self, user, commit=True):
         name = self.cleaned_data['name']

-        new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=name.lower(),
-            category='set', user=user)
+        new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=name.lower(), category='set', user=user)

 
         new_set.save()
         return new_set
 
         new_set.save()
         return new_set