Archived
Various fixes
This commit is contained in:
1 parent
d4d9697236
commit
f7c535496a
6 files changed
+21
-8
No files matched your search
@@ -1,3 +1,3 @@
|
||||
D.U.S.K.E.N
|
||||
===========
|
||||
Dårlig Utrustet Studentystem som Kommer til å Endre Norge.
|
||||
Dårlig Utrustet Studentsystem som Kommer til å Endre Norge.
|
||||
@@ -117,7 +117,8 @@ INSTALLED_APPS = (
|
||||
'django.contrib.staticfiles',
|
||||
'django.contrib.admin',
|
||||
'django.contrib.admindocs',
|
||||
'main'
|
||||
'main',
|
||||
'tastypie'
|
||||
)
|
||||
|
||||
# A sample logging configuration. The only tangible logging
|
||||
|
||||
+11
-1
@@ -13,7 +13,17 @@ middleware here, or combine a Django application with an application of another
|
||||
framework.
|
||||
|
||||
"""
|
||||
import os
|
||||
import os,sys
|
||||
|
||||
from os.path import dirname, join
|
||||
|
||||
def map_path(target_name=''):
|
||||
'''Enables path names to be decided at runtime.'''
|
||||
return join(dirname(__file__), target_name).replace('\\', '/')
|
||||
|
||||
path = map_path("..")
|
||||
if path not in sys.path:
|
||||
sys.path.append(path)
|
||||
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dusken.settings")
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from tastypie.resources import ModelResource
|
||||
from tastypie.authorization import Authorization
|
||||
from main.models import *
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ class NorwegianAddress(models.Model):
|
||||
db_table = u'norwegian_address'
|
||||
|
||||
class ExtendedMemberDetails(models.Model):
|
||||
membersid = models.ForeignKey(Members, primary_key=True, db_column='membersid')
|
||||
membersid = models.ForeignKey(Member, primary_key=True, db_column='membersid')
|
||||
class Meta:
|
||||
db_table = u'extended_member_details'
|
||||
|
||||
@@ -32,7 +32,7 @@ class PaymentForMembership(models.Model):
|
||||
class Membership(models.Model):
|
||||
membershipid = models.IntegerField(primary_key=True)
|
||||
startdate = models.DateField()
|
||||
membersid = models.ForeignKey(Members, db_column='membersid')
|
||||
membersid = models.ForeignKey(Member, db_column='membersid')
|
||||
membership_durationid = models.ForeignKey(MembershipDuration, db_column='membership_durationid')
|
||||
payment_for_membershipid = models.ForeignKey(PaymentForMembership, unique=True, null=True, db_column='payment_for_membershipid', blank=True)
|
||||
class Meta:
|
||||
@@ -110,7 +110,7 @@ class Subgroups(models.Model):
|
||||
class GroupMembership(models.Model):
|
||||
group_membershipid = models.IntegerField(primary_key=True)
|
||||
startdate = models.DateField()
|
||||
membersid = models.ForeignKey(Members, db_column='membersid')
|
||||
membersid = models.ForeignKey(Member, db_column='membersid')
|
||||
groupsid = models.ForeignKey(Groups, db_column='groupsid')
|
||||
membership_durationid = models.ForeignKey(MembershipDuration, db_column='membership_durationid')
|
||||
class Meta:
|
||||
@@ -146,7 +146,7 @@ class Member(models.Model):
|
||||
db_table = u'members'
|
||||
|
||||
class MembershasplaceOfStudy(models.Model):
|
||||
membersid = models.ForeignKey(Members, db_column='membersid')
|
||||
membersid = models.ForeignKey(Member, db_column='membersid')
|
||||
place_of_studyid = models.ForeignKey(PlaceOfStudy, db_column='place_of_studyid')
|
||||
class Meta:
|
||||
db_table = u'membershasplace_of_study'
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
from django.conf.urls.defaults import *
|
||||
from myapp.api import MemberResource
|
||||
from tastypie.api import Api
|
||||
from main.api import MemberResource
|
||||
|
||||
v1_api = Api(api_name='v1')
|
||||
v1_api.register(MemberResource())
|
||||
|
||||
Reference in new issue
Block a user