X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8559c95597de98e8f6c580e97224ed3ecc9dc5c0..9c31d87a67dca4861c1e609001a6807eba9b6967:/catalogue/views.py?ds=sidebyside

diff --git a/catalogue/views.py b/catalogue/views.py
index a0315a4c6..d5b4f69d1 100644
--- a/catalogue/views.py
+++ b/catalogue/views.py
@@ -7,12 +7,25 @@ from django.db.models import Q
 from django.contrib.auth.decorators import login_required
 from django.utils.datastructures import SortedDict
 from django.views.decorators.http import require_POST
+from django.contrib import auth
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+from django.utils import simplejson
+from django.utils.functional import Promise
+from django.utils.encoding import force_unicode
 
+from newtagging.views import tagged_object_list
 from catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags
 
 
+class LazyEncoder(simplejson.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, Promise):
+            return force_unicode(obj)
+        return obj
+
+
 def catalogue_redirect(request, tags=''):
     if len(request.GET['q']) > 0:
         try:
@@ -85,31 +98,26 @@ def tagged_book_list(request, tags=''):
     if 'q' in request.GET:
         return catalogue_redirect(request, tags)
     
-    choices_split = tags.split('/')
-    tags = []
-    for tag in choices_split:
-        tag = get_object_or_404(models.Tag, slug=tag)
-        if tag.category == 'set' and (not request.user.is_authenticated() or request.user != tag.user):
-            raise Http404
-        tags.append(tag)
+    try:
+        tags = models.Tag.get_tag_list(tags)
+    except models.Tag.DoesNotExist:
+        raise Http404
         
-    books = models.Book.objects.with_all(tags)
-    
     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     related_tags = models.Tag.objects.related_for_model(tags, models.Book, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
-    
-    form = forms.SearchForm()
-    
-    return render_to_response('catalogue/tagged_book_list.html', dict(
+
+    return tagged_object_list(
+        request,
+        tag_model=models.Tag,
+        queryset_or_model=models.Book,
         tags=tags,
-        form=form,
-        books=books,
-        categories=categories,
-    ), context_instance=RequestContext(request))
+        template_name='catalogue/tagged_book_list.html',
+        extra_context = {'categories': categories, 'form': forms.SearchForm() },
+    )
 
 
 def book_detail(request, slug):
@@ -122,6 +130,38 @@ def book_detail(request, slug):
         context_instance=RequestContext(request))
 
 
+def logout_then_redirect(request):
+    auth.logout(request)
+    return HttpResponseRedirect(request.GET.get('next', '/'))
+
+
+@require_POST
+def register(request):
+    registration_form = UserCreationForm(request.POST, prefix='registration')
+    if registration_form.is_valid():
+        user = registration_form.save()
+        user = auth.authenticate(
+            username=registration_form.cleaned_data['username'], 
+            password=registration_form.cleaned_data['password1']
+        )
+        auth.login(request, user)
+        response_data = {'success': True, 'errors': {}}
+    else:
+        response_data = {'success': False, 'errors': registration_form.errors}
+    return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
+
+
+@require_POST
+def login(request):
+    form = AuthenticationForm(data=request.POST, prefix='login')
+    if form.is_valid():
+        auth.login(request, form.get_user())
+        response_data = {'success': True, 'errors': {}}
+    else:
+        response_data = {'success': False, 'errors': form.errors}
+    return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
+
+
 @login_required
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
@@ -144,6 +184,7 @@ def book_sets(request, slug):
     return render_to_response('catalogue/book_sets.html', locals(),
         context_instance=RequestContext(request))
 
+
 @login_required
 @require_POST
 def new_set(request):