diff --git a/.gitignore b/.gitignore index 2f78cf5..0205d62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.pyc - +.DS_Store diff --git a/docs/pip-requirements.txt b/docs/pip-requirements.txt index 6624270..cef2b6a 100644 --- a/docs/pip-requirements.txt +++ b/docs/pip-requirements.txt @@ -2,3 +2,4 @@ Django==1.5.1 South==0.8.1 distribute==0.6.34 wsgiref==0.1.2 +-g git+http://github.com/sfrischkorn/rockviewer.git#egg=rockviewer 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..018c8f7 100644 --- a/project_directory/common/models.py +++ b/project_directory/common/models.py @@ -14,9 +14,11 @@ class CommonInfo(models.Model): class Category(CommonInfo): parent = models.ForeignKey('self', blank=True, null=True, - on_delete=models.SET_NULL) + on_delete=models.SET_NULL, + related_name='children') 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 bb82efe..a14ce1b 100644 Binary files a/project_directory/db.sqlite3 and b/project_directory/db.sqlite3 differ 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 +) diff --git a/templates/children.html b/templates/children.html new file mode 100644 index 0000000..6bd5d19 --- /dev/null +++ b/templates/children.html @@ -0,0 +1,7 @@ +