Skip to content

Commit

Permalink
Merge pull request #209 from nucleogenesis/is-0.17-qa-fixes
Browse files Browse the repository at this point in the history
Post-QA Fixes: Admin panel,
  • Loading branch information
nucleogenesis authored Dec 17, 2024
2 parents 44fcadb + ec253ff commit 343157c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
15 changes: 9 additions & 6 deletions kolibri_instant_schools_plugin/instant_schools_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from __future__ import unicode_literals
from kolibri.deployment.default.settings.base import *

INSTALLED_APPS = list(INSTALLED_APPS) + ["django.contrib.admin"]

OLD_DB_PATH = os.path.join(conf.KOLIBRI_HOME, 'db.sqlite3')
OLD_HASH_DB_PATH = os.path.join(conf.KOLIBRI_HOME, 'phonehashreverselookup.db')

Expand All @@ -14,9 +16,10 @@
('pt-br', 'Português'),
]

USE_X_FORWARDED_HOST = True
USE_X_FORWARDED_PORT = True
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_SECURE = True
ALLOW_CERTIFICATE_PUSHING = True

USE_X_FORWARDED_HOST = (not DEBUG)
USE_X_FORWARDED_PORT = (not DEBUG)
CSRF_COOKIE_SECURE = (not DEBUG)
SESSION_COOKIE_SECURE = (not DEBUG)
ALLOW_CERTIFICATE_PUSHING = (not DEBUG)
SECURE_FRAME_DENY = False
X_FRAME_OPTIONS = "SAMEORIGIN"
4 changes: 3 additions & 1 deletion kolibri_instant_schools_plugin/kolibri_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@


class User(KolibriPluginBase):
root_view_urls = "root_urls"
translated_view_urls = "urls"
untranslated_view_urls = "untranslated_urls"

Expand Down Expand Up @@ -99,7 +100,6 @@ def theme(self):
},
"tokenMapping": {
"primary": "#e11300",
"appBar": "#cccccc",
},
# sign-in page config
"signIn": {
Expand Down Expand Up @@ -132,6 +132,8 @@ def theme(self):
},
# app bar config
"appBar": {
"background": "#333333",
"textColor": "#ffffff",
"topLogo": {
"src": logo_file,
},
Expand Down
6 changes: 6 additions & 0 deletions kolibri_instant_schools_plugin/root_urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.contrib import admin
from django.urls import path

urlpatterns = [
path('admin/', admin.site.urls),
]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def enable_log_to_stdout(logname):

setup(
name=dist_name,
version="0.15.0",
version="0.17.5",
description=description,
long_description="{readme}\n\n{doclink}".format(
readme=readme,
Expand Down

0 comments on commit 343157c

Please sign in to comment.