From 97a1a32648f35a44b44590d84cc427f0d5079ee1 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 24 Jul 2013 19:11:45 +1200 Subject: [PATCH] stuff --- objrepo/objrepo/.settings.py.swp | Bin 16384 -> 16384 bytes objrepo/objrepo/settings.py | 1 + objrepo/objrepo/settings.pyc | Bin 2880 -> 2904 bytes objrepo/record/models.py | 12 +++++++++++- objrepo/record/tests.py | 11 ++++------- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/objrepo/objrepo/.settings.py.swp b/objrepo/objrepo/.settings.py.swp index 677548a5994990e177245ea005a577ce1cf93ae7..646b761467e359a1d626ddb7238dc72a1999b675 100644 GIT binary patch delta 211 zcmZo@U~Fh$6iYG)^Ym3P*E41S0s#hwfSUJ#SNJxHNeM7oZZ;ISEYGXJ!N8!v36Zs& zENGBlU&X_~Pyxi{Kx_@fOh9~$n}MMNh&_SW7KpWhm<5PGb1^Vn0^->~JQ0YyfVcvP zb(cm@!+0dX!6 z`vb8&5I+T)d>e?b0P$fUUJk@{K%4-?jzDY%#0EeNa)B-o1HooC7JZJ*3YKxqn|o|Z Fm;tzJAQb=r diff --git a/objrepo/objrepo/settings.py b/objrepo/objrepo/settings.py index 0fff30c..f26aee5 100644 --- a/objrepo/objrepo/settings.py +++ b/objrepo/objrepo/settings.py @@ -123,6 +123,7 @@ INSTALLED_APPS = ( # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', + 'record', ) # A sample logging configuration. The only tangible logging diff --git a/objrepo/objrepo/settings.pyc b/objrepo/objrepo/settings.pyc index 8c3a76c17775d9d0da4be55e9bb1e0aa6e108cbc..5aa4cf83489b1fc867c724b3cb60a46b07f2319e 100644 GIT binary patch delta 324 zcmYjMIZgvn41GU8nF${dOTv&qMIaE!u!QA9nInKGkX#|G6itX2|JHPw9=wTwE#;zjm8Xy70ATf{v*m;g0?hhdg z;1OgIoQG7vV@MS|fh>VFNCeg)%buE8fOU<1BypvHA@1D;LA=9skL z7TEeFZ*)RwZi71-+KRaIH`YepkChxR=&9V*YEQ8bFRS1IE?Z}#Yx81VpdSsB-eAbl wcX7%F`Il)Wdkmv&P<)zB|Mg$X)q=Ur-rZFLrJ!t0sA^T`Z0(F&O3?Ksw$O0@xhfm4l!vLE@ zN7y`?#TL*p)Z1uI(v|PzUY& z!W(xuRu}Dh>ACuYe_M~qyzg+j;HN6_ZqKz(YAfh~%kEim6+A~py7{t9 SHpAd9|E!I|N+Un7ul@jX9Wm7a diff --git a/objrepo/record/models.py b/objrepo/record/models.py index 71a8362..558ee94 100644 --- a/objrepo/record/models.py +++ b/objrepo/record/models.py @@ -1,3 +1,13 @@ from django.db import models -# Create your models here. +class Record(models.Model): + metadata = models.TextField(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='+') + label = models.TextField() + pass diff --git a/objrepo/record/tests.py b/objrepo/record/tests.py index 501deb7..ab0cce1 100644 --- a/objrepo/record/tests.py +++ b/objrepo/record/tests.py @@ -6,11 +6,8 @@ Replace this with more appropriate tests for your application. """ from django.test import TestCase +from record.models import Record, Link - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) +class RecordTests(TestCase): + def test_boring(self): + pass