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
+from newtagging import views as newtagging_views
class LazyEncoder(simplejson.JSONEncoder):
return obj
-def catalogue_redirect(request, tags=''):
- if len(request.GET['q']) > 0:
+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):
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()
def book_list(request):
- if 'q' in request.GET:
- return catalogue_redirect(request)
-
books = models.Book.objects.all()
form = forms.SearchForm()
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
-
+
+ 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)
- return tagged_object_list(
+ return newtagging_views.tagged_object_list(
request,
tag_model=models.Tag,
- queryset_or_model=models.Book,
+ queryset_or_model=model,
tags=tags,
- template_name='catalogue/tagged_book_list.html',
- extra_context = {'categories': categories, 'form': forms.SearchForm() },
+ template_name='catalogue/tagged_object_list.html',
+ extra_context = {'categories': categories },
)
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))
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)
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('<p>Aby zarządzać swoimi półkami, musisz się zalogować.</p>')
+
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>Zestawy zostały zapisane</p>')
+ return HttpResponse('<p>Półki zostały zapisane.</p>')
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('<p>Aby zarządzać swoimi półkami, musisz się zalogować.</p>')
+
+ 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>Półki zostały zapisane.</p>')
+ 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):
fnp / wolnelektury.git / blobdiff