X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8559c95597de98e8f6c580e97224ed3ecc9dc5c0..e388c13ff66e64e4266cdb216eca98970c6a8651:/catalogue/views.py diff --git a/catalogue/views.py b/catalogue/views.py index a0315a4c6..08d940164 100644 --- a/catalogue/views.py +++ b/catalogue/views.py @@ -7,26 +7,45 @@ 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 catalogue import models from catalogue import forms from catalogue.utils import split_tags +from newtagging import views as newtagging_views -def catalogue_redirect(request, tags=''): - if len(request.GET['q']) > 0: +class LazyEncoder(simplejson.JSONEncoder): + def default(self, obj): + if isinstance(obj, Promise): + return force_unicode(obj) + return obj + + +def search(request): + query = request.GET.get('q', '') + tags = request.GET.get('tags', '') + if tags == '': + tags = [] + + try: + tag_list = models.Tag.get_tag_list(tags) + tag = models.Tag.objects.get(name=query) + except models.Tag.DoesNotExist: try: - tag = models.Tag.objects.get(name=request.GET['q']) - if len(tags): - tags += '/' - tags = tags + tag.slug - except models.Tag.DoesNotExist: - book = get_object_or_404(models.Book, title=request.GET['q']) + book = models.Book.objects.get(title=query) return HttpResponseRedirect(book.get_absolute_url()) - if len(tags) > 0: - return HttpResponseRedirect(reverse('catalogue.views.tagged_book_list', kwargs=dict(tags=tags))) + except models.Book.DoesNotExist: + return HttpResponseRedirect(reverse('catalogue.views.main_page')) else: - return HttpResponseRedirect(reverse('catalogue.views.main_page')) + tag_list.append(tag) + return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', + kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} + )) def tags_starting_with(request): @@ -50,15 +69,14 @@ def tags_starting_with(request): return HttpResponse('') -def main_page(request): - if 'q' in request.GET: - return catalogue_redirect(request) - +def main_page(request): 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"' tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]}) + fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True, + extra={'where': ['catalogue_tag.category = "theme"']}) categories = split_tags(tags) form = forms.SearchForm() @@ -67,9 +85,6 @@ def main_page(request): def book_list(request): - if 'q' in request.GET: - return catalogue_redirect(request) - books = models.Book.objects.all() form = forms.SearchForm() @@ -81,69 +96,125 @@ def book_list(request): context_instance=RequestContext(request)) -def tagged_book_list(request, tags=''): - if 'q' in request.GET: - return catalogue_redirect(request, tags) +def tagged_object_list(request, tags=''): + try: + tags = models.Tag.get_tag_list(tags) + except models.Tag.DoesNotExist: + raise Http404 - 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) - - books = models.Book.objects.with_all(tags) + model = models.Book + theme_is_set = any(tag.category == 'theme' for tag in tags) + if theme_is_set: + model = models.Fragment 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]}) + related_tags = models.Tag.objects.related_for_model(tags, model, 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 newtagging_views.tagged_object_list( + request, + tag_model=models.Tag, + queryset_or_model=model, tags=tags, - form=form, - books=books, - categories=categories, - ), context_instance=RequestContext(request)) + template_name='catalogue/tagged_object_list.html', + extra_context = {'categories': categories }, + ) def book_detail(request, slug): book = get_object_or_404(models.Book, slug=slug) tags = list(book.tags.filter(~Q(category='set'))) categories = split_tags(tags) - search_form = forms.SearchForm() return render_to_response('catalogue/book_detail.html', locals(), context_instance=RequestContext(request)) -@login_required +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)) + + def book_sets(request, slug): book = get_object_or_404(models.Book, slug=slug) user_sets = models.Tag.objects.filter(category='set', user=request.user) book_sets = book.tags.filter(category='set', user=request.user) + if not request.user.is_authenticated(): + return HttpResponse('

Aby zarządzać swoimi półkami, musisz się zalogować.

') + if request.method == 'POST': - form = forms.BookSetsForm(book, request.user, request.POST) + form = forms.ObjectSetsForm(book, request.user, request.POST) if form.is_valid(): book.tags = ([models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))) if request.is_ajax(): - return HttpResponse('

Zestawy zostały zapisane

') + return HttpResponse('

Półki zostały zapisane.

') else: return HttpResponseRedirect('/') else: - form = forms.BookSetsForm(book, request.user) + form = forms.ObjectSetsForm(book, request.user) new_set_form = forms.NewSetForm() return render_to_response('catalogue/book_sets.html', locals(), context_instance=RequestContext(request)) + +def fragment_sets(request, id): + fragment = get_object_or_404(models.Fragment, pk=id) + user_sets = models.Tag.objects.filter(category='set', user=request.user) + fragment_sets = fragment.tags.filter(category='set', user=request.user) + + if not request.user.is_authenticated(): + return HttpResponse('

Aby zarządzać swoimi półkami, musisz się zalogować.

') + + if request.method == 'POST': + form = forms.ObjectSetsForm(fragment, request.user, request.POST) + if form.is_valid(): + fragment.tags = ([models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] + + list(fragment.tags.filter(~Q(category='set') | ~Q(user=request.user)))) + if request.is_ajax(): + return HttpResponse('

Półki zostały zapisane.

') + else: + return HttpResponseRedirect('/') + else: + form = forms.ObjectSetsForm(book, request.user) + new_set_form = forms.NewSetForm() + + return render_to_response('catalogue/fragment_sets.html', locals(), + context_instance=RequestContext(request)) + + @login_required @require_POST def new_set(request):