X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dbe845386fa136ccb8571e50dadb3c882661a59b..c82303f184e8d139817ca963c81a63e4c442f9b9:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 64d0cde16..f0f3e71db 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -71,12 +71,14 @@ def tags_starting_with(request): def main_page(request): if request.user.is_authenticated(): - extra_where = '((NOT catalogue_tag.category = "set" AND catalogue_tag.main_page = 1) OR catalogue_tag.user_id = %d)' % request.user.id + shelves = models.Tag.objects.filter(category='set', user=request.user) + new_set_form = forms.NewSetForm() + extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id else: - extra_where = 'NOT catalogue_tag.category = "set" AND catalogue_tag.main_page = 1' + 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"']}) + extra={'where': ['catalogue_tag.category = "theme"'] + [extra_where]}) categories = split_tags(tags) form = forms.SearchForm() @@ -222,7 +224,11 @@ 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(u'
PóÅka %s zostaÅa utworzona
' % new_set) + + if request.is_ajax(): + return HttpResponse(u'PóÅka %s zostaÅa utworzona
' % new_set) + else: + return HttpResponseRedirect('/') return render_to_response('catalogue/book_sets.html', locals(), context_instance=RequestContext(request)) @@ -233,9 +239,13 @@ def new_set(request): 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) - + if request.is_ajax(): + return HttpResponse(u'PóÅka %s zostaÅa usuniÄta
' % user_set.name) + else: + return HttpResponseRedirect('/') + + @login_required def user_shelves(request): shelves = models.Tag.objects.filter(category='set', user=request.user)