Merge pull request #894 from rosedu/customization

Customization refactoring
rosedu · Oct 23, 2016 · 71f8703 · 71f8703
2 parents e17094b + 2af96c0
commit 71f8703
Show file tree

Hide file tree

Showing 14 changed files with 278 additions and 56 deletions.
diff --git a/wouso/core/__init__.py b/wouso/core/__init__.py
@@ -28,7 +28,7 @@ def wrapper(*args, **kwargs):
 
 
 def block_if_not_staff(sender, user, request, **kwargs):
-    staff_only_login = BoolSetting.get('staff-only-login').get_value()
+    staff_only_login = BoolSetting.get('setting-staff-only-login').get_value()
     if staff_only_login and not user.is_staff:
         messages.error(request, _('Only staff members can log in'))
         logout(request)

diff --git a/wouso/core/common.py b/wouso/core/common.py
@@ -7,15 +7,15 @@ class App:
 
     @classmethod
     def name(kls):
-        return kls.__name__
+        return kls.__name__.lower()
 
     @classmethod
     def disabled(kls):
         """ Search for a disabled config setting.
         """
         from wouso.core.config.models import BoolSetting
 
-        return BoolSetting.get('disable-%s' % kls.name()).get_value()
+        return BoolSetting.get('setting-%s' % kls.name()).get_value() is False
 
     @classmethod
     def get_modifiers(kls):

diff --git a/wouso/core/config/fixtures/initial_data.json b/wouso/core/config/fixtures/initial_data.json
@@ -1,111 +1,244 @@
 [
     {
-        "pk": "default_group",
+        "pk": "setting-ChallengeGame",
         "model": "config.setting",
         "fields": {
-            "value": ""
+            "value": "True"
         }
     },
     {
-        "pk": "default_race",
+        "pk": "setting-GrandChallengeGame",
         "model": "config.setting",
         "fields": {
-            "value": "1"
+            "value": "False"
         }
     },
     {
-        "pk": "test",
+        "pk": "setting-QotdGame",
         "model": "config.setting",
         "fields": {
-            "value": "test"
+            "value": "True"
         }
     },
     {
-        "pk": "title",
+        "pk": "setting-QuestGame",
         "model": "config.setting",
         "fields": {
-            "value": "World of USO - next"
+            "value": "True"
         }
     },
     {
-        "pk": "intro",
+        "pk": "setting-QuizGame",
         "model": "config.setting",
         "fields": {
-            "value": "World of USO e un joc simplu realizat pentru studen\u021bii cursului de USO (Utilizarea Sistemelor de Operare) din Facultatea de Automatic\u0103 \u0219i Calculatoare a Universit\u0103\u021bii Politehnica Bucure\u0219ti.\r\n\r\nWorld of USO are 3 p\u0103r\u021bi: Question of the Day, Challenge \u0219i The Quest"
+            "value": "True"
         }
     },
     {
-        "pk": "question_number_of_answers",
+        "pk": "setting-SpecialChallengeGame",
         "model": "config.setting",
         "fields": {
-            "value": "4"
+            "value": "False"
         }
     },
     {
-        "pk": "level_limits",
+        "pk": "setting-SpecialQuestGame",
         "model": "config.setting",
         "fields": {
-            "value": "500 1000 1500 2000 2500 3000 3500"
+            "value": "True"
         }
     },
     {
-        "pk": "head_start_date",
+        "pk": "setting-WorkshopGame",
         "model": "config.setting",
         "fields": {
-            "value": "25/12/2016"
+            "value": "False"
         }
     },
     {
-        "pk": "disable-Qproposal",
+        "pk": "theme",
         "model": "config.setting",
         "fields": {
-            "value": ""
+            "value": "default"
         }
     },
     {
-        "pk": "theme",
+        "pk": "setting-question-proposal",
         "model": "config.setting",
         "fields": {
-            "value": ""
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-top",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-magic",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-bazaar",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-bazaar-exchange",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-statistics",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-challenge-top",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-top-pyramid",
+        "model": "config.setting",
+        "fields": {
+            "value": "False"
+        }
+    },
+    {
+        "pk": "setting-lesson",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-messaging",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
         }
     },
     {
-        "pk": "disable-QotdGame",
+        "pk": "setting-file",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-mobile-version",
+        "model": "config.setting",
+        "fields": {
+            "value": "False"
+        }
+    },
+    {
+        "pk": "setting-staff-only-login",
+        "model": "config.setting",
+        "fields": {
+            "value": "False"
+        }
+    },
+    {
+        "pk": "setting-header-autoreload",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-random-challenge",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-top-coins",
         "model": "config.setting",
         "fields": {
             "value": ""
         }
     },
     {
-        "pk": "disable-SpecialQuestGame",
+        "pk": "title",
+        "model": "config.setting",
+        "fields": {
+            "value": "World of USO - next\r\n"
+        }
+    },
+    {
+        "pk": "intro",
+        "model": "config.setting",
+        "fields": {
+            "value": "\"value\": \"World of USO e un joc simplu realizat pentru studenții cursului de USO (Utilizarea Sistemelor de Operare) din Facultatea de Automatică și Calculatoare a Universității Politehnica București.\\r\\n\\r\\nWorld of USO are 3 părți: Question of the Day, Challenge și The Quest\""
+        }
+    },
+    {
+        "pk": "extrainfo",
         "model": "config.setting",
         "fields": {
             "value": ""
         }
     },
     {
-        "pk": "disable-Top",
+        "pk": "hidden_footer",
         "model": "config.setting",
         "fields": {
             "value": ""
         }
     },
     {
-        "pk": "disable-chall-was-set-up-SecurityRule",
+        "pk": "logo",
         "model": "config.setting",
         "fields": {
             "value": ""
         }
     },
     {
-        "pk": "disable-login-multiple-account-SecurityRule",
+        "pk": "default_group",
         "model": "config.setting",
         "fields": {
             "value": ""
         }
     },
     {
-        "pk": "disable-reported-user-SecurityRule",
+        "pk": "default_race",
+        "model": "config.setting",
+        "fields": {
+            "value": "1"
+        }
+    },
+    {
+        "pk": "question_number_of_answers",
+        "model": "config.setting",
+        "fields": {
+            "value": "4"
+        }
+    },
+    {
+        "pk": "head_start_date",
+        "model": "config.setting",
+        "fields": {
+            "value": "01/10/2016"
+        }
+    },
+    {
+        "pk": "sidebar-order",
         "model": "config.setting",
         "fields": {
             "value": ""

diff --git a/wouso/core/config/fixtures/test_data.json b/wouso/core/config/fixtures/test_data.json
@@ -0,0 +1,79 @@
+[
+    {
+        "pk": "setting-challengegame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-grandchallengegame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-qotdgame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-questgame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-quizgame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-qpecialchallengegame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-specialquestgame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-workshopgame",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-magic",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-bazaar",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    },
+    {
+        "pk": "setting-bazaar-exchange",
+        "model": "config.setting",
+        "fields": {
+            "value": "True"
+        }
+    }
+]