Added handling of tags: "mat", "didask_tekst", "slowo_obce", "tytul_dziela", "wyrozni...

[wolnelektury.git] / catalogue / views.py

diff --git a/catalogue/views.py b/catalogue/views.py
index ed0436e..ad9bde7 100644 (file)
--- a/catalogue/views.py
+++ b/catalogue/views.py
@@ -13,10 +13,10 @@ from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 
 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 catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags

+from newtagging import views as newtagging_views

 
 
 class LazyEncoder(simplejson.JSONEncoder):
 
 
 class LazyEncoder(simplejson.JSONEncoder):


@@ -36,7 +36,6 @@ def search(request):
         tag_list = models.Tag.get_tag_list(tags)
         tag = models.Tag.objects.get(name=query)
     except models.Tag.DoesNotExist:
         tag_list = models.Tag.get_tag_list(tags)
         tag = models.Tag.objects.get(name=query)
     except models.Tag.DoesNotExist:

-        print "%r, %r" % (query, tags)

         try:
             book = models.Book.objects.get(title=query)
             return HttpResponseRedirect(book.get_absolute_url())
         try:
             book = models.Book.objects.get(title=query)
             return HttpResponseRedirect(book.get_absolute_url())


@@ -44,7 +43,7 @@ def search(request):
             return HttpResponseRedirect(reverse('catalogue.views.main_page'))
     else:
         tag_list.append(tag)
             return HttpResponseRedirect(reverse('catalogue.views.main_page'))
     else:
         tag_list.append(tag)

-        return HttpResponseRedirect(reverse('catalogue.views.tagged_book_list', 
+        return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', 

             kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
         ))
 
             kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
         ))
 


@@ -76,6 +75,8 @@ def main_page(request):
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})
     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()
     categories = split_tags(tags)
     
     form = forms.SearchForm()


@@ -95,25 +96,30 @@ def book_list(request):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-def tagged_book_list(request, tags=''):
+def tagged_object_list(request, tags=''):

     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
         raise Http404
     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"'
     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)
 
     categories = split_tags(related_tags)
 

-    return tagged_object_list(
+    return newtagging_views.tagged_object_list(

         request,
         tag_model=models.Tag,
         request,
         tag_model=models.Tag,

-        queryset_or_model=models.Book,
+        queryset_or_model=model,

         tags=tags,
         tags=tags,

-        template_name='catalogue/tagged_book_list.html',
+        template_name='catalogue/tagged_object_list.html',

         extra_context = {'categories': categories },
     )
 
         extra_context = {'categories': categories },
     )
 


@@ -159,37 +165,80 @@ def login(request):
     return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
 
 
     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)
     
 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':
     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():
         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:
             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))
 
 
         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(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)
 @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('<p>Zestaw <strong>%s</strong> został utworzony</p>' % new_set)
+        return HttpResponse(u'<p>Półka <strong>%s</strong> została utworzona</p>' % new_set)

     
     return render_to_response('catalogue/book_sets.html', locals(),
             context_instance=RequestContext(request))
 
     
     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>Półka <strong>%s</strong> została usunięta</p>' % 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))
+