Created JSON field, descriptor, and formfield to handle json storage on models unifor...

[philo.git] / models / collections.py

diff --git a/models/collections.py b/models/collections.py
index 61b2608..539ecdb 100644 (file)
--- a/models/collections.py
+++ b/models/collections.py
@@ -1,8 +1,9 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic

-from philo.models.base import register_value_model
+from philo.models.base import value_content_type_limiter, register_value_model

 from philo.utils import fattr
 from philo.utils import fattr

+from django.template import add_to_builtins as register_templatetags

 
 
 class Collection(models.Model):
 
 
 class Collection(models.Model):


@@ -31,7 +32,7 @@ class CollectionMember(models.Model):
        objects = CollectionMemberManager()
        collection = models.ForeignKey(Collection, related_name='members')
        index = models.PositiveIntegerField(verbose_name='Index', help_text='This will determine the ordering of the item within the collection. (Optional)', null=True, blank=True)
        objects = CollectionMemberManager()
        collection = models.ForeignKey(Collection, related_name='members')
        index = models.PositiveIntegerField(verbose_name='Index', help_text='This will determine the ordering of the item within the collection. (Optional)', null=True, blank=True)

-       member_content_type = models.ForeignKey(ContentType, verbose_name='Member type')
+       member_content_type = models.ForeignKey(ContentType, limit_choices_to=value_content_type_limiter, verbose_name='Member type')

        member_object_id = models.PositiveIntegerField(verbose_name='Member ID')
        member = generic.GenericForeignKey('member_content_type', 'member_object_id')
        
        member_object_id = models.PositiveIntegerField(verbose_name='Member ID')
        member = generic.GenericForeignKey('member_content_type', 'member_object_id')
        


@@ -42,4 +43,5 @@ class CollectionMember(models.Model):
                app_label = 'philo'
 
 
                app_label = 'philo'
 
 

+register_templatetags('philo.templatetags.collections')

 register_value_model(Collection)
\ No newline at end of file
 register_value_model(Collection)
\ No newline at end of file