X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/77effa3964014b07dbdf73a9e67eb0b20749d50b..78f64bd3e21f1a5610b50bc3235ad4c85dfe11c9:/catalogue/views.py diff --git a/catalogue/views.py b/catalogue/views.py index de41e1518..ad9bde747 100644 --- a/catalogue/views.py +++ b/catalogue/views.py @@ -174,30 +174,71 @@ def book_sets(request, slug): 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('PóÅki 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(fragment, 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): new_set_form = forms.NewSetForm(request.POST) if new_set_form.is_valid(): new_set = new_set_form.save(request.user) - return HttpResponse('Zestaw %s zostaÅ utworzony
' % new_set) + return HttpResponse(u'PóÅka %s zostaÅa utworzona
' % new_set) return render_to_response('catalogue/book_sets.html', locals(), context_instance=RequestContext(request)) + +@login_required +@require_POST +def delete_shelf(request, slug): + user_set = get_object_or_404(models.Tag, slug=slug, category='set', user=request.user) + user_set.delete() + return HttpResponse(u'PóÅka %s zostaÅa usuniÄta
' % user_set.name) + + +@login_required +def user_shelves(request): + shelves = models.Tag.objects.filter(category='set', user=request.user) + new_set_form = forms.NewSetForm() + return render_to_response('catalogue/user_shelves.html', locals(), + context_instance=RequestContext(request)) +