X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..aa24f78a82a1d76003a964fefc69e5a5bf96a746:/src/social/forms.py?ds=sidebyside

diff --git a/src/social/forms.py b/src/social/forms.py
old mode 100755
new mode 100644
index 389185889..8527915a6
--- a/src/social/forms.py
+++ b/src/social/forms.py
@@ -1,11 +1,10 @@
-# -*- 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.
 #
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
-from catalogue.models import Tag
+from catalogue.models import Book, Tag
 from catalogue import utils
 from social.utils import get_set, set_sets
 
@@ -26,8 +25,9 @@ class ObjectSetsForm(forms.Form):
         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):
@@ -49,3 +49,47 @@ class NewSetForm(forms.Form):
 
         new_set.save()
         return new_set
+
+
+class AddSetForm(forms.Form):
+    name = forms.CharField(max_length=50)
+    book = forms.IntegerField()
+
+    def save(self, user):
+        name = self.cleaned_data['name'].strip()
+        if not name: return
+        tag = get_set(user, name)
+        try:
+            book = Book.objects.get(id=self.cleaned_data['book'])
+        except Book.DoesNotExist:
+            return
+
+        try:
+            book.tag_relations.create(tag=tag)
+        except:
+            pass
+
+        return book, tag
+
+
+class RemoveSetForm(forms.Form):
+    slug = forms.CharField(max_length=50)
+    book = forms.IntegerField()
+
+    def save(self, user):
+        slug = self.cleaned_data['slug']
+        try:
+            tag = Tag.objects.get(user=user, slug=slug)
+        except Tag.DoesNotExist:
+            return
+        try:
+            book = Book.objects.get(id=self.cleaned_data['book'])
+        except Book.DoesNotExist:
+            return
+
+        try:
+            book.tag_relations.filter(tag=tag).delete()
+        except:
+            pass
+
+        return book, tag