shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/sfrischkorn/rockviewer

Browse Source
This commit is contained in:
Shane Frischkorn
2013-07-27 09:58:51 +10:00
parent 8de2cd413c f00cfdf8e2
commit dd8614fdff
9 changed files with 99 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,2 +1,2 @@
*.pyc
.DS_Store

1
docs/pip-requirements.txt
View File

@@ -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

40
project_directory/common/migrations/0002_auto__add_field_sample_model_filename.py Normal file
View File

@@ -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']

38
project_directory/common/migrations/0003_auto__chg_field_sample_model_filename.py Normal file
View File

@@ -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']

4
project_directory/common/models.py
View File

@@ -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)

BIN
project_directory/db.sqlite3
View File

Binary file not shown.

8
project_directory/rockviewer/settings.py
View File

@@ -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
)

7
templates/children.html Normal file
View File

@@ -0,0 +1,7 @@
<ul>
{% for child in children %}
<li> <a href="{{ child.get_absolute_url }}">{{ child }}</a></li>
{% child.children.count > 0 %}
{% children_list child %}
{% endfor %}
</ul>

1
templates/main.html Normal file
View File

@@ -0,0 +1 @@
{% children_tag parent %}