From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 26 Jan 2012 13:17:43 +0000 (+0100)
Subject: merge
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/71209be8f9c399340bddb819f71e99ecf116187b?ds=sidebyside;hp=-c

merge
---

71209be8f9c399340bddb819f71e99ecf116187b
diff --combined apps/catalogue/views.py
index 14147c886,69bde8f2d..9044a809e
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@@ -4,32 -4,25 +4,25 @@@
  #
  import re
  import itertools
- from datetime import datetime
  
  from django.conf import settings
  from django.template import RequestContext
  from django.shortcuts import render_to_response, get_object_or_404
  from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
  from django.core.urlresolvers import reverse
- from django.db.models import Count, Sum, Q
+ from django.db.models import Q
  from django.contrib.auth.decorators import login_required, user_passes_test
  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.http import urlquote_plus
- from django.views.decorators import cache
  from django.utils import translation
  from django.utils.translation import ugettext as _
- from django.views.generic.list_detail import object_list
  
- from ajaxable.utils import LazyEncoder, JSONResponse, AjaxableFormView
+ from ajaxable.utils import JSONResponse, AjaxableFormView
  
  from catalogue import models
  from catalogue import forms
  from catalogue.utils import (split_tags, AttachmentHttpResponse,
      async_build_pdf, MultiQuerySet)
- from catalogue.tasks import touch_tag
  from pdcounter import models as pdcounter_models
  from pdcounter import views as pdcounter_views
  from suggest.forms import PublishingSuggestForm
@@@ -103,6 -96,7 +96,6 @@@ def differentiate_tags(request, tags, a
  
  
  def tagged_object_list(request, tags=''):
 -    #    import pdb; pdb.set_trace()
      try:
          tags = models.Tag.get_tag_list(tags)
      except models.Tag.DoesNotExist:
diff --combined apps/search/templatetags/search_tags.py
index 5bbc42225,06631b2dc..0e20913d5
--- a/apps/search/templatetags/search_tags.py
+++ b/apps/search/templatetags/search_tags.py
@@@ -44,7 -44,7 +44,8 @@@ def book_searched(context, result)
      return {
          'related': book.related_info(),
          'book': book,
 +        'main_link': book.get_absolute_url(),
          'request': context.get('request'),
          'hits': hits,
+         'main_link': book.get_absolute_url(),
      }