From f7c535496a71dd9bae11d35bf0eaee4ff486967f Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Thu, 22 Nov 2012 11:29:57 +0100
Subject: [PATCH] Various fixes

---
 README.md                        |  2 +-
 dusken/dusken/settings-sample.py |  3 ++-
 dusken/dusken/wsgi.py            | 12 +++++++++++-
 dusken/main/api.py               |  1 +
 dusken/main/models.py            |  8 ++++----
 dusken/main/urls.py              |  3 ++-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2233910..bebe292 100644
--- a/README.md
+++ b/README.md
@@ -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.
diff --git a/dusken/dusken/settings-sample.py b/dusken/dusken/settings-sample.py
index 22584e6..a8b3fe0 100644
--- a/dusken/dusken/settings-sample.py
+++ b/dusken/dusken/settings-sample.py
@@ -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
diff --git a/dusken/dusken/wsgi.py b/dusken/dusken/wsgi.py
index 92f8e31..039367f 100644
--- a/dusken/dusken/wsgi.py
+++ b/dusken/dusken/wsgi.py
@@ -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")
 
diff --git a/dusken/main/api.py b/dusken/main/api.py
index e4e02af..5f08329 100644
--- a/dusken/main/api.py
+++ b/dusken/main/api.py
@@ -1,4 +1,5 @@
 from tastypie.resources import ModelResource
+from tastypie.authorization import Authorization
 from main.models import *
 
 
diff --git a/dusken/main/models.py b/dusken/main/models.py
index 5616238..b758ebc 100644
--- a/dusken/main/models.py
+++ b/dusken/main/models.py
@@ -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'
diff --git a/dusken/main/urls.py b/dusken/main/urls.py
index 405532c..c3d5d0f 100644
--- a/dusken/main/urls.py
+++ b/dusken/main/urls.py
@@ -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())