cleanup imports and syntax warnings
This commit is contained in:
parent
7fdae917cf
commit
2d5f924891
46 changed files with 452 additions and 517 deletions
|
|
@ -5,6 +5,7 @@ from django.contrib import admin
|
|||
|
||||
import models
|
||||
|
||||
|
||||
class PageAdmin(admin.ModelAdmin):
|
||||
search_fields = ['name', 'body']
|
||||
|
||||
|
|
@ -15,4 +16,3 @@ class SiteSettingsAdmin(admin.ModelAdmin):
|
|||
search_fields = ['key', 'value']
|
||||
|
||||
admin.site.register(models.SiteSettings, SiteSettingsAdmin)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
# vi:si:et:sw=4:sts=4:ts=4
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Page(models.Model):
|
||||
created = models.DateTimeField(auto_now_add=True)
|
||||
modified = models.DateTimeField(auto_now=True)
|
||||
|
|
@ -11,10 +12,10 @@ class Page(models.Model):
|
|||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class SiteSettings(models.Model):
|
||||
key = models.CharField(max_length=1024, unique=True)
|
||||
value = models.TextField(blank=True)
|
||||
|
||||
def __unicode__(self):
|
||||
return self.key
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ Replace these with more appropriate tests for your application.
|
|||
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
class SimpleTest(TestCase):
|
||||
|
||||
def test_basic_addition(self):
|
||||
"""
|
||||
Tests that 1 + 1 always equals 2.
|
||||
|
|
@ -20,4 +22,3 @@ Another way to test that 1 + 1 is equal to 2.
|
|||
>>> 1 + 1 == 2
|
||||
True
|
||||
"""}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,32 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vi:si:et:sw=4:sts=4:ts=4
|
||||
from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404
|
||||
from django.shortcuts import render_to_response
|
||||
from django.template import RequestContext
|
||||
from django.conf import settings
|
||||
|
||||
from ox.django.shortcuts import json_response, render_to_json_response, get_object_or_404_json
|
||||
from ox.utils import json
|
||||
|
||||
import models
|
||||
|
||||
from item.models import siteJson
|
||||
|
||||
from api.actions import actions
|
||||
|
||||
|
||||
def intro(request):
|
||||
context = RequestContext(request, {'settings':settings})
|
||||
context = RequestContext(request, {'settings': settings})
|
||||
return render_to_response('intro.html', context)
|
||||
|
||||
|
||||
def index(request):
|
||||
context = RequestContext(request, {'settings':settings})
|
||||
if request.GET.get('_escaped_fragment_', None):
|
||||
return html_snapshot(request)
|
||||
context = RequestContext(request, {'settings': settings})
|
||||
return render_to_response('index.html', context)
|
||||
|
||||
|
||||
def timeline(request):
|
||||
context = RequestContext(request, {'settings':settings})
|
||||
context = RequestContext(request, {'settings': settings})
|
||||
return render_to_response('timeline.html', context)
|
||||
|
||||
|
||||
def getPage(request):
|
||||
data = json.loads(request.POST['data'])
|
||||
name = data['page']
|
||||
|
|
@ -34,6 +35,7 @@ def getPage(request):
|
|||
return render_to_json_response(response)
|
||||
actions.register(getPage)
|
||||
|
||||
|
||||
def site_json(request):
|
||||
'''
|
||||
return render_to_json_response(siteJson())
|
||||
|
|
@ -41,6 +43,7 @@ def site_json(request):
|
|||
siteSettings = {}
|
||||
for s in models.SiteSettings.objects.all():
|
||||
siteSettings[s.key] = s.value
|
||||
context = RequestContext(request, {'settings':settings, 'siteSettings': siteSettings})
|
||||
return render_to_response('site.json', context, mimetype="application/javascript")
|
||||
|
||||
context = RequestContext(request, {'settings': settings,
|
||||
'siteSettings': siteSettings})
|
||||
return render_to_response('site.json', context,
|
||||
mimetype="application/javascript")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue