From 17c10c3278cd3f4fbedac90d01959caf524bd023 Mon Sep 17 00:00:00 2001 From: Shane Frischkorn Date: Wed, 24 Jul 2013 20:31:29 +1000 Subject: [PATCH] added filename field for the 3d model --- .gitignore | 2 +- ...2_auto__add_field_sample_model_filename.py | 40 ++++++++++++++++++ ...3_auto__chg_field_sample_model_filename.py | 38 +++++++++++++++++ project_directory/common/models.py | 1 + project_directory/db.sqlite3 | Bin 44032 -> 45056 bytes project_directory/rockviewer/settings.py | 8 ++++ 6 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 project_directory/common/migrations/0002_auto__add_field_sample_model_filename.py create mode 100644 project_directory/common/migrations/0003_auto__chg_field_sample_model_filename.py diff --git a/.gitignore b/.gitignore index 2f78cf5..0205d62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.pyc - +.DS_Store diff --git a/project_directory/common/migrations/0002_auto__add_field_sample_model_filename.py b/project_directory/common/migrations/0002_auto__add_field_sample_model_filename.py new file mode 100644 index 0000000..9577c63 --- /dev/null +++ b/project_directory/common/migrations/0002_auto__add_field_sample_model_filename.py @@ -0,0 +1,40 @@ +# -*- 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 'Sample.model_filename' + db.add_column(u'common_sample', 'model_filename', + self.gf('django.db.models.fields.CharField')(max_length=1000, null=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Sample.model_filename' + db.delete_column(u'common_sample', 'model_filename') + + + models = { + u'common.category': { + 'Meta': {'object_name': 'Category'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.Category']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}) + }, + u'common.sample': { + 'Meta': {'object_name': 'Sample'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model_filename': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.Category']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}) + } + } + + complete_apps = ['common'] \ No newline at end of file diff --git a/project_directory/common/migrations/0003_auto__chg_field_sample_model_filename.py b/project_directory/common/migrations/0003_auto__chg_field_sample_model_filename.py new file mode 100644 index 0000000..cf9f8c8 --- /dev/null +++ b/project_directory/common/migrations/0003_auto__chg_field_sample_model_filename.py @@ -0,0 +1,38 @@ +# -*- 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 'Sample.model_filename' + db.alter_column(u'common_sample', 'model_filename', self.gf('django.db.models.fields.CharField')(default='', max_length=1000)) + + def backwards(self, orm): + + # Changing field 'Sample.model_filename' + db.alter_column(u'common_sample', 'model_filename', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True)) + + models = { + u'common.category': { + 'Meta': {'object_name': 'Category'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.Category']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}) + }, + u'common.sample': { + 'Meta': {'object_name': 'Sample'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model_filename': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.Category']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}) + } + } + + complete_apps = ['common'] \ No newline at end of file diff --git a/project_directory/common/models.py b/project_directory/common/models.py index 31e445e..be9cc1a 100644 --- a/project_directory/common/models.py +++ b/project_directory/common/models.py @@ -18,5 +18,6 @@ class Category(CommonInfo): class Sample(CommonInfo): + model_filename = models.CharField(max_length=1000) parent = models.ForeignKey(Category, blank=True, null=True, on_delete=models.SET_NULL) diff --git a/project_directory/db.sqlite3 b/project_directory/db.sqlite3 index bb82efef751b495df2fb2c8c01ec25e879d3d07d..a14ce1b42b571e0fd210799e1e5296affe5549e1 100644 GIT binary patch delta 1515 zcmb7EZ)h839Dd*TcWsxDt}Bk!GP_>eX)}|C+`s11ZMxWWqqez}HXF5~=Ph?hv*i+- zq|F)z-4*v)+rvMfgc|Xq5TguKQ1)e?=ASR3sNjTsC^&|~{5L`0G+i~2Qat!^$M1RW zd7u0J9`4H5nUfs;kC`ei^k;3VWA0w+0$Kde~q;uSmL8UI{3S&W{E6czKFITs!ml?xF`F>72a z&$L8V7xz-e3pPLT$$y=S0fD!j6TiFG5djl{3D;n~VyW=-QHbEZj56>YdUQe7I4vj& z$&$V-7B0zIt(45`!?|2a$}A-U7omDB8rkP!U=YD)@Ftvt!HU%dD?^L}g&eq}$I;IF zIbp~j7~(~iPLbzEILQ}~WI>Xgd}LA27qS`SG}P(6_;@3olSlkPUr?0&vh3t$v`n2( zM(4Fm($HBms~c%GkxCmG%`|*IQrEHHdG>iHfCs@%xD1|()dMS0XhGdtD4sRVY{u{R z3#ztQ$f|05K1l_Pw65kg^To8GHflEd;b{(nK3N{-0>LP06y&!BHC=BaII!cgQIQ)S zkpjM8KotCfeNzn_XhkOwI)NqpF_|TQz~wc|UH$ZhQ(*UAed#@&VJTr2p;-+0eZrFu z;MAHGu9mMpN2>QXCh+>(Oqp>pP6F2v+=A;+u68nS!0{*Qr^<8_wKZ&qnHPCUVvaxv zH-&{-f*AYO%L8=7cM$vqzrinXhbn##3J!wm|51d&HbtHXhMjy>4Ext#*v*5tc!4ejmQS$4t57wS+uc?}VA z2$4hJ!7S{@fc{>y>=jj#uv*a0r;TuUQjJZAl$p?IY&@!{v9Xz0vz~W!dMp$hV`HJG zCdb%j4Awo%(jNe`)YsM(9K=?4Dx({h>gjoq6p{M*wd-X3Bwk(KI$q6Z7Yp-h#we|Se^GwCiRr#QO;`Uc sw=yp3vvy%x-fE}oE_5IOhoimLgWEJvG)~{b;jO^*q27OUvJ;(u033(B&;S4c delta 440 zcmXw!KWI}?6vofF-+OJ|rHvK|!G9!1Fo;$Xo-rB}E2v8`EhthDiI2Ppf=P-kE?Vd- zrH=Z%gW!;%DK3IGy-3h0&^dyOIAkymg6L3(Qn5w7iwC~p{0`qa-JHn6zDOOv- z3n6$i46Z9V{!8|V(I&Lf(<9bP==Q{wNJOAPc#nobPoWw&ZVxcJgs$n=p}M7f)TRzm zhu?}Z(ZgIAywYcHjbY8Vl2Mxz#0hSSqWFusRxr%!VR=zcE#4F?H4niuS^9)N*3G_m z;B(=HeX9TXusOR$*uj>;-x0ImumBuKn%4w23ES8-qi;}?bzA>_CM^?dgRo)XSEQnB zQ^IksdNqG$wqC0Y8=K7_-WE%^%nul0@YA|~XfUpxFP};lFJ78TrpondwO%XDc-85< zmD0&<#?N?OIhC9!DzCXmPJ8z%wb{}gKc!;Jfqt_z&N9d+2IJ{8FN~^O^StUDiK*8| Tht%q$YuZ}b!P?3n2*>#cugZQH diff --git a/project_directory/rockviewer/settings.py b/project_directory/rockviewer/settings.py index c54ce66..e30fe51 100644 --- a/project_directory/rockviewer/settings.py +++ b/project_directory/rockviewer/settings.py @@ -156,3 +156,11 @@ LOGGING = { }, } } + + +# Custom config settings +MODEL_DIRS = ( + # put model directories here, separated by commas. If there are + # models with the same name under different directories, the first + # directory will be used +)