From 62124c199bb07afe11ce1d4cc6e4febbd8c7a031 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 13 Oct 2020 21:08:38 +0100 Subject: [PATCH] Saving instance type --- theme.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/theme.py b/theme.py index a8072e76..f1171b83 100644 --- a/theme.py +++ b/theme.py @@ -47,9 +47,18 @@ def setInstanceTypeInConfig(baseDir: str, name: str) -> bool: configJson = loadJson(configFilename, 0) if not configJson: return False - configJson['newsInstance'] = ('news' in name) - configJson['mediaInstance'] = ('media' in name) - configJson['blogsInstance'] = ('blog' in name) + + configJson['newsInstance'] = False + configJson['mediaInstance'] = False + configJson['blogsInstance'] = False + + if 'news' in name: + configJson['newsInstance'] = True + if 'media' in name: + configJson['mediaInstance'] = True + if 'blog' in name: + configJson['blogsInstance'] = True + return saveJson(configJson, configFilename) @@ -260,7 +269,6 @@ def setThemeIndymedia(baseDir: str): name = 'indymedia' removeTheme(baseDir) setThemeInConfig(baseDir, name) - setInstanceTypeInConfig(baseDir, 'news') bgParams = { "login": "jpg", "follow": "jpg", @@ -329,6 +337,7 @@ def setThemeIndymedia(baseDir: str): "login-button-fg-color": "white" } setThemeFromDict(baseDir, name, themeParams, bgParams) + setInstanceTypeInConfig(baseDir, 'news') def setThemeBlue(baseDir: str):