kmike / django-faves / changeset / 1627b255b0eb

Up to file-list docs/overview.txt:

@@ -46,7 +46,7 @@ Views:
 Template filters:
  - has_faved
- - is_vavorited
+ - is_favorited
 Template tags:
@@ -56,6 +56,7 @@ Template tags:
  - get_faves_for_user
  - get_favorited
  - get_fave
  - inject_faves_to
@@ -126,3 +127,27 @@ You have 'details' page for 1 object. It
 {% else %}
     <a href = '{% get_fave_url object "favorites" %}'>remove from favorites</a>
 {% endif %}
 === New in version 0.6.2 ===
 `inject_faves_to` template tag is added. It is similar to `get_favorited` tag
 but instead of setting context variable it adds attribute with Fave instance
 for each favorited object in `objects` list (iterable with django models).
 Syntax::
 	{% inject_faves_to [objects] by [user] of type [fave-type-slug] as [attribute_name] %}
 Example::
 	{% load faves %}
 	{% inject_faves_to page.object_list by request.user of type favorites as fave %}
 	{% for object in page.object_list %}
 	    {{ object }}
 	    {% if object.fave %}
 	        favorited
 	    {% endif %}
 	{% endfor %}

Up to file-list faves/templatetags/faves.py:

@@ -12,6 +12,24 @@ register = Library()
 Fave = models.get_model('faves', 'fave')
 FaveType = models.get_model('faves', 'favetype')
 def validate_template_tag_params(bits, arguments_count, keyword_positions):
     '''
         Raises exception if passed params (`bits`) do not match signature.
         Signature is defined by `bits_len` (acceptible number of params) and
         keyword_positions (dictionary with positions in keys and keywords in values,
         for ex. {2:'by', 4:'of', 5:'type', 7:'as'}).
     '''
     if len(bits) != arguments_count+1:
         raise template.TemplateSyntaxError("'%s' tag takes %d arguments" % (bits[0], arguments_count,))
     for pos in keyword_positions:
         value = keyword_positions[pos]
         if bits[pos] != value:
             raise template.TemplateSyntaxError("argument #%d to '%s' tag must be '%s'" % (pos, bits[0], value))
 @register.filter
 def has_faved(value, arg):
     """
@@ -106,7 +124,9 @@ def get_unfave_url(object, fave_type_slu
     """
     try:
         content_type = ContentType.objects.get_for_model(object)
-        return reverse('unfave_object', args=(fave_type_slug, content_type.id, object.id))
+        return reverse('unfave_object', kwargs={'fave_type_slug': fave_type_slug,
                                                 'content_type_id': content_type.id,
                                                 'object_id': object.id})
     except:
         return ''
@@ -125,7 +145,6 @@ class GetFavoritesForUserNode(template.N
                 context[self.varname] = Fave.objects.active().filter(type__slug=self.fave_type_slug, user=user, content_type=content_type)
             else:
                 context[self.varname] = Fave.objects.active().filter(type__slug=self.fave_type_slug, user=user)
 #            context[self.varname] = Fave.objects.active().filter(type__slug=self.fave_type_slug, user=user).values('id','content_type_id','object_id')
         except:
             pass
         return ''
@@ -162,25 +181,33 @@ def get_faves_for_user(parser, token):
         return GetFavoritesForUserNode(bits[1], bits[4], bits[5], bits[7])
 class GetFavoritedNode(template.Node):
     def __init__(self, object_list, user, fave_type_slug, varname):
         self.object_list, self.user, self.fave_type_slug, self.varname = object_list, user, fave_type_slug, varname
     def return_results(self):
         context[self.varname] = self.faves_dict
     def render(self, context):
         try:
             user = resolve_variable(self.user, context)
             objects = resolve_variable(self.object_list, context)
             content_type = ContentType.objects.get_for_model(objects[0])
             id_values = [item.id for item in objects]
             self.objects = resolve_variable(self.object_list, context)
             ''' allow single object to be passed by putting it into list '''
             try:
                 it = iter(self.objects)
             except TypeError:
                 self.objects = [self.objects]
             content_type = ContentType.objects.get_for_model(self.objects[0])
             faves = Fave.objects.active().filter(type__slug=self.fave_type_slug,
                                                  user=user,
                                                  content_type=content_type,
-                                                 object_id__in=id_values)
+                                                 object_id__in=[item.id for item in self.objects])
             self.faves_dict = dict((fave.object_id, fave) for fave in list(faves))
-            context[self.varname] = dict((fave.object_id,fave,) for fave in list(faves))
+            self.return_results()
         except:
             pass
         return ''
@@ -210,17 +237,43 @@ def get_favorited(parser, token):
     """
     bits = token.contents.split()
     validate_template_tag_params(bits, 8, {2:'by', 4:'of', 5:'type', 7:'as'})
     return GetFavoritedNode(bits[1], bits[3], bits[6], bits[8])
 class InjectFavesToNode(GetFavoritedNode):
     def return_results(self):
         for object in self.objects:
             if self.faves_dict.has_key(object.id):
                 object.__setattr__(self.varname, self.faves_dict[object.id])
 @register.tag
 def inject_faves_to(parser, token):
     """
     Adds attribute with Fave instance for each favorited object in `objects` list (iterable with django models)
     if len(bits) != 9:
         raise template.TemplateSyntaxError("'%s' tag takes 8 arguments" % bits[0])
     keyword_positions = {2:'by', 4:'of', 5:'type', 7:'as'}
     for pos in keyword_positions:
         value = keyword_positions[pos]
         if bits[pos] != value:
             raise template.TemplateSyntaxError("argument #%d to '%s' tag must be '%s'" % (pos, bits[0], value))
     return GetFavoritedNode(bits[1], bits[3], bits[6], bits[8])
     Syntax::
         {% inject_faves_to [objects] by [user] of type [fave-type-slug] as [attribute_name] %}
     Example::
         {% inject_faves_to page.object_list by request.user of type favorites as fave %}
         {% for object in page.object_list %}
             {{ object }}
             {% if object.fave %}
                 favorited
             {% endif %}
         {% endfor %}
     """
     bits = token.contents.split()
     validate_template_tag_params(bits, 8, {2:'by', 4:'of', 5:'type', 7:'as'})
     return InjectFavesToNode(bits[1], bits[3], bits[6], bits[8])
@@ -255,16 +308,6 @@ def get_fave(parser, token):
     """
     bits = token.contents.split()
     if len(bits) != 10:
         raise template.TemplateSyntaxError("'%s' tag takes nine arguments" % bits[0])
     if bits[1] != 'by':
         raise template.TemplateSyntaxError("first argument to '%s' tag must be 'by'" % bits[0])
     if bits[3] != 'on':
         raise template.TemplateSyntaxError("third argument to '%s' tag must be 'on'" % bits[0])
     if bits[5] != 'of':
         raise template.TemplateSyntaxError("fifth argument to '%s' tag must be 'of'" % bits[0])
     if bits[6] != 'type':
         raise template.TemplateSyntaxError("sixth argument to '%s' tag must be 'type'" % bits[0])
     if bits[8] != 'as':
         raise template.TemplateSyntaxError("eighth argument to '%s' tag must be 'as'" % bits[0])
     validate_template_tag_params(bits, 9, {1:'by', 3:'on', 5:'of', 6:'type', 8:'as'})
     return GetFavoriteNode(bits[2], bits[4], bits[7], bits[9])

Up to file-list setup.py:

@@ -3,7 +3,7 @@ from distutils.core import setup
 setup(
       name='django-faves',
-      version='0.6.1',
+      version='0.6.2',
       author='jeffrey.a.croft, Mikhail Korobov',
       author_email='kmike84@gmail.com',
       url='http://bitbucket.org/kmike/django-faves/',

commit 79:	1627b255b0eb
parent 78:	3c15f0cc9717
branch:	trunk
tags:	v0.6.2