Add an is_link flag to the list of things returned in the context data for each instance. Removed the is_direct flag, as there were no tests for it and I have no idea what it was for.

Author: mjumbewu

example_project/example_project.db

@@ -0,0 +1,52 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Pepulator.address'
+        db.add_column('pepulator_factory_pepulator', 'address', self.gf('django.db.models.fields.URLField')(max_length=200, null=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Pepulator.address'
+        db.delete_column('pepulator_factory_pepulator', 'address')
+
+
+    models = {
+        'pepulator_factory.distributor': {
+            'Meta': {'object_name': 'Distributor'},
+            'capacity': ('django.db.models.fields.IntegerField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'primary_key': 'True'})
+        },
+        'pepulator_factory.jamb': {
+            'Meta': {'object_name': 'Jamb'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pepulator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'jambs'", 'to': "orm['pepulator_factory.Pepulator']"}),
+            'power': ('django.db.models.fields.FloatField', [], {})
+        },
+        'pepulator_factory.knuckle': {
+            'Meta': {'object_name': 'Knuckle'},
+            'hardness': ('django.db.models.fields.FloatField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'img_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'pepulator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'knuckles'", 'to': "orm['pepulator_factory.Pepulator']"})
+        },
+        'pepulator_factory.pepulator': {
+            'Meta': {'object_name': 'Pepulator'},
+            'address': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'color': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'distributed_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stock'", 'null': 'True', 'to': "orm['pepulator_factory.Distributor']"}),
+            'height': ('django.db.models.fields.IntegerField', [], {}),
+            'manufacture_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'serial_number': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'width': ('django.db.models.fields.IntegerField', [], {})
+        }
+    }
+
+    complete_apps = ['pepulator_factory']

example_project/pepulator_factory/migrations/0004_auto__add_field_pepulator_address.py

@@ -6,6 +6,7 @@ class Pepulator (models.Model):
     width = models.IntegerField()
     manufacture_date = models.DateTimeField(auto_now=True)
     color = models.CharField(max_length=32)
+    address = models.URLField(null=True)
 
     distributed_by = models.ForeignKey('Distributor', null=True, 
                                        related_name='stock')

example_project/pepulator_factory/models.py

@@ -1 +1 @@
-[{"pk": 1234, "model": "pepulator_factory.pepulator", "fields": {"color": "red", "width": 15, "manufacture_date": "2011-06-10 11:12:21", "distributed_by": "Walmart", "height": 12}}, {"pk": 1235, "model": "pepulator_factory.pepulator", "fields": {"color": "red", "width": 15, "manufacture_date": "2011-06-10 11:12:33", "distributed_by": "Walmart", "height": 12}}, {"pk": 1238, "model": "pepulator_factory.pepulator", "fields": {"color": "chartreuse", "width": 17, "manufacture_date": "2011-06-10 11:13:30", "distributed_by": "Mom & Pop", "height": 12}}, {"pk": 2345, "model": "pepulator_factory.pepulator", "fields": {"color": "blue", "width": 15, "manufacture_date": "2011-06-10 11:12:49", "distributed_by": "Walmart", "height": 12}}, {"pk": 2346, "model": "pepulator_factory.pepulator", "fields": {"color": "blue", "width": 15, "manufacture_date": "2011-06-10 11:13:02", "distributed_by": "Walmart", "height": 12}}, {"pk": "Walmart", "model": "pepulator_factory.distributor", "fields": {"capacity": 1000000}}, {"pk": "Home Depot", "model": "pepulator_factory.distributor", "fields": {"capacity": 700000}}, {"pk": "Mom & Pop", "model": "pepulator_factory.distributor", "fields": {"capacity": 175}}, {"pk": 1, "model": "pepulator_factory.knuckle", "fields": {"pepulator": 1235, "hardness": 2.3450000000000002}}, {"pk": 2, "model": "pepulator_factory.knuckle", "fields": {"pepulator": 1235, "hardness": 1.1000000000000001}}]
+[{"pk": 1234, "model": "pepulator_factory.pepulator", "fields": {"color": "red", "width": 15, "manufacture_date": "2011-06-10 11:12:21", "distributed_by": "Walmart", "height": 12}}, {"pk": 1235, "model": "pepulator_factory.pepulator", "fields": {"address": "ppr://1235/", "color": "red", "width": 15, "manufacture_date": "2011-06-10 11:12:33", "distributed_by": "Walmart", "height": 12}}, {"pk": 1238, "model": "pepulator_factory.pepulator", "fields": {"color": "chartreuse", "width": 17, "manufacture_date": "2011-06-10 11:13:30", "distributed_by": "Mom & Pop", "height": 12}}, {"pk": 2345, "model": "pepulator_factory.pepulator", "fields": {"color": "blue", "width": 15, "manufacture_date": "2011-06-10 11:12:49", "distributed_by": "Walmart", "height": 12}}, {"pk": 2346, "model": "pepulator_factory.pepulator", "fields": {"color": "blue", "width": 15, "manufacture_date": "2011-06-10 11:13:02", "distributed_by": "Walmart", "height": 12}}, {"pk": "Walmart", "model": "pepulator_factory.distributor", "fields": {"capacity": 1000000}}, {"pk": "Home Depot", "model": "pepulator_factory.distributor", "fields": {"capacity": 700000}}, {"pk": "Mom & Pop", "model": "pepulator_factory.distributor", "fields": {"capacity": 175}}, {"pk": 1, "model": "pepulator_factory.knuckle", "fields": {"pepulator": 1235, "hardness": 2.3450000000000002}}, {"pk": 2, "model": "pepulator_factory.knuckle", "fields": {"pepulator": 1235, "hardness": 1.1000000000000001}}]

model_blocks/fixtures/pepulator_factory_data.json

@@ -136,12 +136,12 @@ def get_context_data(self, instance, context):
             label = field.verbose_name
             value = getattr(instance, field.name)
             is_list = False
-            is_direct = True
+            is_link = (type(field).__name__ in ('URLField',))
             model = instance._meta.module_name
 
             if value is not None:
                 fields.append((
-                    name, label, value, is_list, is_direct, model,
+                    name, label, value, is_list, is_link, model,
                 ))
 
         for rel_obj, model in instance._meta.get_all_related_objects_with_model():
@@ -156,11 +156,11 @@ def get_context_data(self, instance, context):
             label = name
             value = getattr(instance, name)
             is_list = isinstance(value, (list, tuple, Manager))
-            is_direct = False
+            is_link = False
 
             if value is not None:
                 fields.append((
-                    name, label, value, is_list, is_direct, model,
+                    name, label, value, is_list, is_link, model,
                 ))
 
         # If include_fields was defined, then sort by the order.

model_blocks/templatetags/model_nodes.py

@@ -21,7 +21,20 @@ def setUp(self):
         # Mock Django's get_template so that it doesn't load a real file;
         # instead just return a template that allows us to verify the context
         model_nodes.get_template = Mock(
-            return_value=Template('{{ title|default_if_none:instance|safe }}:{{ model|safe }},{% for name, label, value, is_list in fields %}{{ name|safe }},{{ label|safe }},{% if not is_list %}{{ value|safe }}{% else %}[{% for item in value.all %}{{ item|safe }},{% endfor %}]{% endif %},{% endfor %}'))
+            return_value=Template(('{{ title|default_if_none:instance|safe }}:{{ model|safe }},'
+                                   '{% for name, label, value, is_list, is_link in fields %}'
+                                     '{{ name|safe }},'
+                                     '{{ label|safe }},'
+                                     '{% if not is_list %}'
+                                       '{% if is_link %}'
+                                         '@{{ value }}'
+                                       '{% else %}'
+                                         '{{ value|safe }}'
+                                       '{% endif %}'
+                                     '{% else %}'
+                                       '[{% for item in value.all %}{{ item|safe }},{% endfor %}]'
+                                     '{% endif %},'
+                                   '{% endfor %}')))
 
 
     def test_model_format(self):
@@ -34,6 +47,7 @@ def test_model_format(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,@ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"
@@ -59,6 +73,7 @@ def test_filter_is_registered(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,@ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"
@@ -84,6 +99,7 @@ def test_title_is_used(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,@ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"
@@ -129,6 +145,7 @@ def test_model_format(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"
@@ -267,6 +284,7 @@ def test_tag_is_registered(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"
@@ -306,7 +324,7 @@ def test_with_excluded_fields(self):
 
         template = Template(('{% load model_tags %}'
                              '{% with pepulator_factory_pepulator_detail_template="pepulator_factory/pepulator_detail.html" %}'
-                             '{% with pepulator_factory_pepulator_exclude="knuckles, jambs, color" %}'
+                             '{% with pepulator_factory_pepulator_exclude="knuckles, jambs, color, address" %}'
                              '{% detail_block pepulator %}'
                              '{% endwith %}'
                              '{% endwith %}'))
@@ -362,6 +380,7 @@ def test_tag_is_registered(self):
             "width,width,15,"
             "manufacture_date,manufacture date,2011-06-10 11:12:33,"
             "color,color,red,"
+            "address,address,ppr://1235/,"
             "distributed_by,distributed by,Walmart,"
             "knuckles,knuckles,[Knuckle of hardness 2.35,Knuckle of hardness 1.10,],"
             "jambs,jambs,[],"