Double nesting won't work

diff --git a/karmaworld/apps/quizzes/admin.py b/karmaworld/apps/quizzes/admin.py
index 0012ca71d766e09622868554ba7f7828ebd14357..7bf57123dfd871aa4755701171bc087f767ff4d3 100644 (file)
--- a/karmaworld/apps/quizzes/admin.py
+++ b/karmaworld/apps/quizzes/admin.py
@@ -2,7 +2,6 @@
 # -*- coding:utf8 -*-
 # Copyright (C) 2014  FinalsClub Foundation
 from django.contrib import admin
-from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
 from karmaworld.apps.quizzes.models import MultipleChoiceQuestion, FlashCardQuestion, MultipleChoiceOption, Quiz
 
 
@@ -12,13 +11,7 @@ class MultipleChoiceOptionInlineAdmin(NestedTabularInline):
 
 class MultipleChoiceQuestionAdmin(NestedModelAdmin):
     model = MultipleChoiceQuestion
-    inlines = [MultipleChoiceOptionInlineAdmin,]
-    list_display = ('question_text', 'quiz')
-
-
-class MultipleChoiceQuestionInlineAdmin(NestedStackedInline):
-    model = MultipleChoiceQuestion
-    inlines = [MultipleChoiceOptionInlineAdmin,]
+    inlines = [MultipleChoiceOptionInlineAdmin]
     list_display = ('question_text', 'quiz')
 
 
@@ -28,9 +21,8 @@ class FlashCardQuestionInlineAdmin(NestedStackedInline):
 
 
 class QuizAdmin(NestedModelAdmin):
-    #search_fields = ['name', 'note__name']
-    #list_display = ('name', 'note')
-    inlines = [MultipleChoiceQuestionInlineAdmin, FlashCardQuestionInlineAdmin]
+    search_fields = ['name', 'note__name']
+    list_display = ('name', 'note')
 
 
 admin.site.register(Quiz, QuizAdmin)

diff --git a/karmaworld/apps/quizzes/views.py b/karmaworld/apps/quizzes/views.py
index bda04b78d4a8f9fbb68108db004382a06b7b5ea5..f3e8702503bcd61d47166737932666661b760251 100644 (file)
--- a/karmaworld/apps/quizzes/views.py
+++ b/karmaworld/apps/quizzes/views.py
@@ -3,8 +3,7 @@
 # Copyright (C) 2014  FinalsClub Foundation
 from itertools import chain
 
-from django.views.generic import TemplateView, DetailView
-from django.views.generic.detail import SingleObjectMixin
+from django.views.generic import DetailView
 from karmaworld.apps.quizzes.models import Quiz, ALL_QUESTION_CLASSES
 
 

diff --git a/karmaworld/settings/dev.py b/karmaworld/settings/dev.py
index 232cf4f3b9c482cac5b8050513df787182811993..a84cf571295d073e9845f042f844e545f5fb598d 100644 (file)
--- a/karmaworld/settings/dev.py
+++ b/karmaworld/settings/dev.py
@@ -60,7 +60,6 @@ INSTALLED_APPS += (
 
 # See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
 # DEFAULT_FILE_STORAGE comes from karmaworld.secret.static_s3
-STATICFILES_STORAGE = DEFAULT_FILE_STORAGE
 
 # See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
 AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN

diff --git a/reqs/common.txt b/reqs/common.txt
index 0dd59c422bf30ecbcfdd1eaf4bd8519d0d7f5cff..08ec9c8673304298cdcd37bc5669b35b4328b45a 100644 (file)
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -21,5 +21,4 @@ html2text
 django-allauth
 boto==2.6.0
 django-storages==1.1.4
-git+https://github.com/Soaa-/django-nested-inlines.git
 django-reversion