From 85d337a6e498fc49ad2d4346c9c5d289f827c8aa Mon Sep 17 00:00:00 2001
From: Chris Forbes <chris.forbes@catalyst.net.nz>
Date: Thu, 25 Jul 2013 10:55:58 +1200
Subject: [PATCH] add jsonfield, links, etc

---
 objrepo/objrepo/.settings.py.swp              | Bin 16384 -> 16384 bytes
 objrepo/objrepo/settings.py                   |   2 +
 objrepo/objrepo/settings.pyc                  | Bin 2904 -> 2942 bytes
 objrepo/record/migrations/0001_initial.py     |  54 ++++++++++++++++++
 ...eld_link_inherit__add_field_link_prefix.py |  49 ++++++++++++++++
 .../0003_auto__chg_field_record_metadata.py   |  39 +++++++++++++
 objrepo/record/migrations/__init__.py         |   0
 objrepo/record/models.py                      |  10 ++--
 8 files changed, 150 insertions(+), 4 deletions(-)
 create mode 100644 objrepo/record/migrations/0001_initial.py
 create mode 100644 objrepo/record/migrations/0002_auto__add_field_link_inherit__add_field_link_prefix.py
 create mode 100644 objrepo/record/migrations/0003_auto__chg_field_record_metadata.py
 create mode 100644 objrepo/record/migrations/__init__.py

diff --git a/objrepo/objrepo/.settings.py.swp b/objrepo/objrepo/.settings.py.swp
index 646b761467e359a1d626ddb7238dc72a1999b675..a2f1bd135485f8a82af3f500a47fdbf4b6283c55 100644
GIT binary patch
delta 228
zcmZo@U~Fh$6iYG)^Ym3P*E41S0s#hwhoK(=4b?V^NeM7oZ#ERTEYJIkoq>Ug6C!Ip
zS<oQAzM6-DAq$9OfH(?>BY{{Jh@WsXFsuOLEFjhfVtF9u1>$F13=CI+cnc8M0&y`A
z=KygO5IX{~G7x_T+OQLd*8}kiAf67y)j%8s#3n#23dCGM%)-gQ40O(7Mi!3E3YIy{
g;_6w&`FUxXsW~a?It&UxpkAC`T9UE3)ux&m0KvQ`rT_o{

delta 204
zcmZo@U~Fh$6iYG)^Ym3P*E41S0s#hwfSUJ#SNJxHNeM7oZZ;ISEYGXJ!N8!v36Zs&
zENGBlU&X_~Pyxi{Kx_@fOh9~$n}MMNh&_SW7KpWhm<5PGb1^Vn0^->~JQ0YyfVcvP
z<AK-_hy{W8I?(j9Kzs~{w*v7@AT9vnARsmdVhtcx0%EW$7#KFQ8~$dWxIt|*lVuL`
J<{q08W&jZ#A_)Kh

diff --git a/objrepo/objrepo/settings.py b/objrepo/objrepo/settings.py
index f26aee5..bb0dcc9 100644
--- a/objrepo/objrepo/settings.py
+++ b/objrepo/objrepo/settings.py
@@ -123,6 +123,8 @@ INSTALLED_APPS = (
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'south',
+    'jsonfield',
     'record',
 )
 
diff --git a/objrepo/objrepo/settings.pyc b/objrepo/objrepo/settings.pyc
index 5aa4cf83489b1fc867c724b3cb60a46b07f2319e..c362db2eb1056cb681e51c0b38ba4caeed8cb751 100644
GIT binary patch
delta 304
zcmX|+O-=$q5QSeeLxQ6w{@?(*(8NE40sI}&6;}{rjI}cHjX1{00^GQ9!v)A(fTjC6
zfY)$myn%^(wOWjwetBJAy-K=X{VzXoKBv9+vyYQ2{GAE)ma5k>Km>?EWFQ%EZx{@o
z_93(20b~xGfy{#;Bo7`!7QiCJ2TPCw*n||pBS;Bx7MucC5k`yP8p7B>FW12hgxpk>
z$It<{z{)S|XhJcoV4zl0)p!15HQ0V#;dns5%7#|kDox1}xQo;Bae8S+P9bYI>OS;u
v`gXtDUibbwj_#O#yLrd8C^>hZy>?DtZCj=<x#f&`Oy0Z;7X~J2POkg_*dsco

delta 261
zcmX|*yGjFL5QV=#OGq#ZYINOb;a#Koy~N9EnMY8poI(W8BB=!{!NwPmeF1yReHmMy
zz`|Y}jX2E5Va}X^`AXl?n0!u*ojrV<-|$xr*MW042vC3pih$Kn|2aNA9$-`G5SvDm
zSQ{N-Gw2wbMH!Z&4mO8!EJG()hhZI!qh<199<7iM1KwIiYvfvYHb!QGHc|K2y!C|J
z+CtkdJty}6V?BQM(aq6;zp5RdcAY(PTR{6<bWf}6@RC$ny`6+c8Jn-wdvmcC?#s}+
IEU#Ki-!1(y1poj5

diff --git a/objrepo/record/migrations/0001_initial.py b/objrepo/record/migrations/0001_initial.py
new file mode 100644
index 0000000..991f91d
--- /dev/null
+++ b/objrepo/record/migrations/0001_initial.py
@@ -0,0 +1,54 @@
+# -*- coding: 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 model 'Record'
+        db.create_table(u'record_record', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('metadata', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('title', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal(u'record', ['Record'])
+
+        # Adding model 'Link'
+        db.create_table(u'record_link', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('link_from', self.gf('django.db.models.fields.related.ForeignKey')(related_name='+', to=orm['record.Record'])),
+            ('link_to', self.gf('django.db.models.fields.related.ForeignKey')(related_name='+', to=orm['record.Record'])),
+            ('label', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal(u'record', ['Link'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Record'
+        db.delete_table(u'record_record')
+
+        # Deleting model 'Link'
+        db.delete_table(u'record_link')
+
+
+    models = {
+        u'record.link': {
+            'Meta': {'object_name': 'Link'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.TextField', [], {}),
+            'link_from': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['record.Record']"}),
+            'link_to': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['record.Record']"})
+        },
+        u'record.record': {
+            'Meta': {'object_name': 'Record'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['record.Record']", 'through': u"orm['record.Link']", 'symmetrical': 'False'}),
+            'title': ('django.db.models.fields.TextField', [], {})
+        }
+    }
+
+    complete_apps = ['record']
\ No newline at end of file
diff --git a/objrepo/record/migrations/0002_auto__add_field_link_inherit__add_field_link_prefix.py b/objrepo/record/migrations/0002_auto__add_field_link_inherit__add_field_link_prefix.py
new file mode 100644
index 0000000..6ab523e
--- /dev/null
+++ b/objrepo/record/migrations/0002_auto__add_field_link_inherit__add_field_link_prefix.py
@@ -0,0 +1,49 @@
+# -*- coding: 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 'Link.inherit'
+        db.add_column(u'record_link', 'inherit',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Adding field 'Link.prefix'
+        db.add_column(u'record_link', 'prefix',
+                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Link.inherit'
+        db.delete_column(u'record_link', 'inherit')
+
+        # Deleting field 'Link.prefix'
+        db.delete_column(u'record_link', 'prefix')
+
+
+    models = {
+        u'record.link': {
+            'Meta': {'object_name': 'Link'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inherit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'label': ('django.db.models.fields.TextField', [], {}),
+            'link_from': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['record.Record']"}),
+            'link_to': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['record.Record']"}),
+            'prefix': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
+        },
+        u'record.record': {
+            'Meta': {'object_name': 'Record'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['record.Record']", 'through': u"orm['record.Link']", 'symmetrical': 'False'}),
+            'title': ('django.db.models.fields.TextField', [], {})
+        }
+    }
+
+    complete_apps = ['record']
\ No newline at end of file
diff --git a/objrepo/record/migrations/0003_auto__chg_field_record_metadata.py b/objrepo/record/migrations/0003_auto__chg_field_record_metadata.py
new file mode 100644
index 0000000..cece1c7
--- /dev/null
+++ b/objrepo/record/migrations/0003_auto__chg_field_record_metadata.py
@@ -0,0 +1,39 @@
+# -*- coding: 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):
+
+        # Changing field 'Record.metadata'
+        db.alter_column(u'record_record', 'metadata', self.gf('jsonfield.fields.JSONField')())
+
+    def backwards(self, orm):
+
+        # Changing field 'Record.metadata'
+        db.alter_column(u'record_record', 'metadata', self.gf('django.db.models.fields.TextField')())
+
+    models = {
+        u'record.link': {
+            'Meta': {'object_name': 'Link'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inherit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'label': ('django.db.models.fields.TextField', [], {}),
+            'link_from': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'out_links'", 'to': u"orm['record.Record']"}),
+            'link_to': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'in_links'", 'to': u"orm['record.Record']"}),
+            'prefix': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
+        },
+        u'record.record': {
+            'Meta': {'object_name': 'Record'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata': ('jsonfield.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
+            'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['record.Record']", 'through': u"orm['record.Link']", 'symmetrical': 'False'}),
+            'title': ('django.db.models.fields.TextField', [], {})
+        }
+    }
+
+    complete_apps = ['record']
\ No newline at end of file
diff --git a/objrepo/record/migrations/__init__.py b/objrepo/record/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/objrepo/record/models.py b/objrepo/record/models.py
index 558ee94..b9d2860 100644
--- a/objrepo/record/models.py
+++ b/objrepo/record/models.py
@@ -1,13 +1,15 @@
 from django.db import models
+from jsonfield.fields import JSONField
 
 class Record(models.Model):
-    metadata = models.TextField(blank=True)
+    metadata = JSONField(blank=True)
     title = models.TextField()
 
     related = models.ManyToManyField('Record', through='Link')
 
 class Link(models.Model):
-    link_from = models.ForeignKey(Record, related_name='+')
-    link_to = models.ForeignKey(Record, related_name='+')
+    link_from = models.ForeignKey(Record, related_name='out_links')
+    link_to = models.ForeignKey(Record, related_name='in_links')
     label = models.TextField()
-    pass
+    inherit = models.BooleanField()
+    prefix = models.CharField(blank=True, null=True, max_length=128)