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

changing namespace and urls

Browse Source
This commit is contained in:
Shane Frischkorn
2013-07-27 22:23:05 +10:00
parent dd8614fdff
commit 08e36dacb1
19 changed files with 68 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,40 +0,0 @@
# -*- 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
View File

@@ -1,38 +0,0 @@
# -*- 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']

1
project_directory/common/views.py
View File

@@ -1 +0,0 @@
# Create your views here.

BIN
project_directory/db.sqlite3
View File

Binary file not shown.

2
project_directory/rockviewer/settings.py
View File

@@ -124,7 +124,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs',
'common',
'three_d_viewer',
'south',
)

1
project_directory/rockviewer/urls.py
View File

@@ -13,5 +13,6 @@ urlpatterns = patterns('',
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
url(r'', include('three_d_viewer.urls', namespace="three_d_viewer")),
url(r'^admin/', include(admin.site.urls)),
)

0
project_directory/common/__init__.py → project_directory/three_d_viewer/__init__.py
View File

2
project_directory/common/admin.py → project_directory/three_d_viewer/admin.py
View File

@@ -1,5 +1,5 @@
from django.contrib import admin
from common.models import Category, Sample
from three_d_viewer.models import Category, Sample
admin.site.register(Category)
admin.site.register(Sample)

28
project_directory/common/migrations/0001_initial.py → project_directory/three_d_viewer/migrations/0001_initial.py
View File

@@ -9,47 +9,49 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'Category'
db.create_table(u'common_category', (
db.create_table(u'three_d_viewer_category', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('active', self.gf('django.db.models.fields.BooleanField')(default=True)),
('parent', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['common.Category'], null=True, on_delete=models.SET_NULL, blank=True)),
('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, on_delete=models.SET_NULL, to=orm['three_d_viewer.Category'])),
))
db.send_create_signal(u'common', ['Category'])
db.send_create_signal(u'three_d_viewer', ['Category'])
# Adding model 'Sample'
db.create_table(u'common_sample', (
db.create_table(u'three_d_viewer_sample', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('active', self.gf('django.db.models.fields.BooleanField')(default=True)),
('parent', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['common.Category'], null=True, on_delete=models.SET_NULL, blank=True)),
('model_filename', self.gf('django.db.models.fields.CharField')(max_length=1000)),
('parent', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['three_d_viewer.Category'], null=True, on_delete=models.SET_NULL, blank=True)),
))
db.send_create_signal(u'common', ['Sample'])
db.send_create_signal(u'three_d_viewer', ['Sample'])
def backwards(self, orm):
# Deleting model 'Category'
db.delete_table(u'common_category')
db.delete_table(u'three_d_viewer_category')
# Deleting model 'Sample'
db.delete_table(u'common_sample')
db.delete_table(u'three_d_viewer_sample')
models = {
u'common.category': {
u'three_d_viewer.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'})
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['three_d_viewer.Category']"})
},
u'common.sample': {
u'three_d_viewer.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'})
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['three_d_viewer.Category']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'})
}
}
complete_apps = ['common']
complete_apps = ['three_d_viewer']

0
project_directory/common/migrations/__init__.py → project_directory/three_d_viewer/migrations/__init__.py
View File

0
project_directory/common/models.py → project_directory/three_d_viewer/models.py
View File

7
project_directory/three_d_viewer/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
project_directory/three_d_viewer/templates/main.html Normal file
View File

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

1
project_directory/three_d_viewer/templates/three_d_viewer/detail.html Normal file
View File

@@ -0,0 +1 @@
<h1>{{ sample.name }}</h1>

9
project_directory/three_d_viewer/templates/three_d_viewer/index.html Normal file
View File

@@ -0,0 +1,9 @@
{% if active_samples %}
<ul>
{% for sample in active_samples %}
<li><a href="{% url 'three_d_viewer:detail' sample.id %}">{{ sample.name }}</a></li>
{% endfor %}
</ul>
{% else %}
<p>No samples are available.</p>
{% endif %}

0
project_directory/common/tests.py → project_directory/three_d_viewer/tests.py
View File

9
project_directory/three_d_viewer/urls.py Normal file
View File

@@ -0,0 +1,9 @@
from django.conf.urls import patterns, url
from three_d_viewer import views
urlpatterns = patterns('',
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'),
)

31
project_directory/three_d_viewer/views.py Normal file
View File

@@ -0,0 +1,31 @@
from django import template
from django.shortcuts import get_object_or_404, render
from django.http import HttpResponseRedirect, HttpResponse
from django.core.urlresolvers import reverse
from django.views import generic
from three_d_viewer.models import Sample
register = template.Library()
@register.inclusion_tag('children.html')
def children_tag(category):
children = category.children.all()
return {'children': children}
class IndexView(generic.ListView):
template_name = 'three_d_viewer/index.html'
context_object_name = 'active_samples'
def get_queryset(self):
"""
Return the last five published polls (not including those set to be
published in the future).
"""
return Sample.objects.filter(active=True)
class DetailView(generic.DetailView):
model = Sample
template_name = 'three_d_viewer/detail.html'