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

diff --git a/src/social/forms.py b/src/social/forms.py
index 8527915a6..4d39f0812 100644
--- a/src/social/forms.py
+++ b/src/social/forms.py
@@ -1,54 +1,10 @@
-# 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 Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 from django import forms
-from django.utils.translation import gettext_lazy as _
 
-from catalogue.models import Book, Tag
-from catalogue import utils
-from social.utils import get_set, set_sets
-
-
-class UserSetsForm(forms.Form):
-    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()],
-        )
-
-
-class ObjectSetsForm(forms.Form):
-    tags = forms.CharField(label=_('Tags (comma-separated)'), required=False,
-                           widget=forms.Textarea())
-
-    def __init__(self, obj, user, *args, **kwargs):
-        self._obj = obj
-        self._user = user
-        data = kwargs.setdefault('data', {})
-        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):
-        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}
-
-
-class NewSetForm(forms.Form):
-    name = forms.CharField(max_length=50, required=True)
-
-    def __init__(self, *args, **kwargs):
-        super(NewSetForm, self).__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs['title'] = _('Name of the new shelf')
-
-    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.save()
-        return new_set
+from catalogue.models import Book
+from . import models
 
 
 class AddSetForm(forms.Form):
@@ -58,18 +14,18 @@ class AddSetForm(forms.Form):
     def save(self, user):
         name = self.cleaned_data['name'].strip()
         if not name: return
-        tag = get_set(user, name)
+        ul = models.UserList.get_by_name(user, name, create=True)
         try:
             book = Book.objects.get(id=self.cleaned_data['book'])
         except Book.DoesNotExist:
             return
 
         try:
-            book.tag_relations.create(tag=tag)
+            ul.append(book=book)
         except:
             pass
 
-        return book, tag
+        return book, ul
 
 
 class RemoveSetForm(forms.Form):
@@ -79,8 +35,8 @@ class RemoveSetForm(forms.Form):
     def save(self, user):
         slug = self.cleaned_data['slug']
         try:
-            tag = Tag.objects.get(user=user, slug=slug)
-        except Tag.DoesNotExist:
+            ul = models.UserList.objects.get(user=user, slug=slug)
+        except models.UserList.DoesNotExist:
             return
         try:
             book = Book.objects.get(id=self.cleaned_data['book'])
@@ -88,8 +44,8 @@ class RemoveSetForm(forms.Form):
             return
 
         try:
-            book.tag_relations.filter(tag=tag).delete()
+            ul.userlistitem_set.filter(book=book).delete()
         except:
             pass
 
-        return book, tag
+        return book, ul