untested commit

This commit is contained in:
nikolark committed 2012-10-22 21:39:23 +02:00
1 parent d0f5d171a0
commit d4d9697236
5 files changed
+27 -17

No files matched your search

+3 -4
View File
@@ -115,10 +115,9 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
# 'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'django.contrib.admin',
'django.contrib.admindocs',
'main'
)
# A sample logging configuration. The only tangible logging
+5 -12
View File
@@ -1,17 +1,10 @@
from django.conf.urls import patterns, include, url
# Uncomment the next two lines to enable the admin:
# from django.contrib import admin
# admin.autodiscover()
from django.contrib import admin
admin.autodiscover()
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'dusken.views.home', name='home'),
# url(r'^dusken/', include('dusken.foo.urls')),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)),
# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
# url(r'^admin/', include(admin.site.urls)),
url(r'^', include('main.urls')),
)
+9
View File
@@ -0,0 +1,9 @@
from tastypie.resources import ModelResource
from main.models import *
class MemberResource(ModelResource):
class Meta:
queryset = Member.objects.all()
resource_name = 'member'
authorization= Authorization() # for dev (VERY INSECURE)
+1 -1
View File
@@ -133,7 +133,7 @@ class Positions(models.Model):
class Meta:
db_table = u'positions'
class Members(models.Model):
class Member(models.Model):
membersid = models.IntegerField(primary_key=True)
email = models.CharField(max_length=150, unique=True)
username = models.CharField(max_length=40, unique=True)
+9
View File
@@ -0,0 +1,9 @@
from django.conf.urls.defaults import *
from myapp.api import MemberResource
v1_api = Api(api_name='v1')
v1_api.register(MemberResource())
urlpatterns = patterns('',
(r'^api/', include(v1_api.urls)),
)