Fixes #139 wiki preview error

mhackspace/base/management/commands/generate_test_data.py

@@ -12,7 +12,7 @@ from django.core.management.base import BaseCommand
 from django.core.management import call_command
 from mhackspace.base.models import BannerImage
 from mhackspace.feeds.models import Article, Feed
-from mhackspace.users.models import User, Rfid
+from mhackspace.users.models import User, Rfid, Membership, MEMBERSHIP_STATUS_CHOICES
 from mhackspace.blog.models import Category, Post
 from mhackspace.rfid.models import Device, DeviceAuth
 
@@ -53,6 +53,7 @@ class Command(BaseCommand):
 
 
         User.objects.all().delete()
+        Membership.objects.all().delete()
         users = AutoFixture(User, field_values={
             'title': ChoicesGenerator(values=('Mr', 'Mrs', 'Emperor', 'Captain')),
             'password': make_password('autofixtures'),
@@ -70,6 +71,13 @@ class Command(BaseCommand):
         }, generate_fk=True)
         users.create(1)
 
+        user_list = User.objects.all()
+        members = AutoFixture(Membership, field_values={
+            'status': ChoicesGenerator(MEMBERSHIP_STATUS_CHOICES),
+            'user': ChoicesGenerator(values=user_list)
+        })
+        members.create(8)
+
         Rfid.objects.all().delete()
         Device.objects.all().delete()
         DeviceAuth.objects.all().delete()

mhackspace/static/sass/components/_wiki.scss

@@ -0,0 +1,19 @@
+.modal-body iframe {
+    width: 100%;
+    height: 100%;
+}
+.modal-dialog {
+    top: 0px;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    margin: 50px;
+    padding: 0;
+    max-width: None;
+}
+
+.modal-content {
+    height: auto;
+    min-height: 100%;
+    border-radius: 0;
+}

mhackspace/static/sass/project.scss

@@ -9,6 +9,7 @@
 @import "components/feeds";
 
 @import "components/blog";
+@import "components/wiki";
 
 ////////////////////////////////
 		//Django Toolbar//

mhackspace/users/admin.py

@@ -62,7 +62,7 @@ class MyUserAdmin(AuthUserAdmin):
 
 @admin.register(Membership)
 class MembershipAdmin(ModelAdmin):
-    list_display = ('user', 'payment', 'date', 'status')
+    list_display = ('user_id', 'user', 'payment', 'date', 'status')
     list_filter = ('status',)
 
 

mhackspace/users/models.py

@@ -68,6 +68,7 @@ MEMBERSHIP_STATUS = {
     'cancelled': 4
 }
 
+
 class Membership(models.Model):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,