Skip to content

Commit eaae918

Browse files
feat: keyvalue helpers
1 parent 8a7b67f commit eaae918

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

pythoncms/modules/box__default/keyvalue/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ def get_value(key):
3131
if s:
3232
return s.value
3333
else:
34-
return ''
34+
raise Exception('Value not set for key', key)

pythoncms/modules/box__default/theme/helpers.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
from flask import url_for
55
from init import themes_path
6-
6+
from modules.box__default.keyvalue.helpers import get_value
77

88
def get_front_theme_dir():
9-
theme_dir = os.path.join(themes_path, "front", os.environ.get('ACTIVE_FRONT_THEME', 'editorial'))
9+
theme_dir = os.path.join(themes_path, "front", get_value('ACTIVE_FRONT_THEME'))
1010
return theme_dir
1111

1212

@@ -18,7 +18,7 @@ def get_front_theme_info_data():
1818

1919

2020
def get_active_front_theme():
21-
return os.environ.get('ACTIVE_FRONT_THEME', 'editorial')
21+
return get_value('ACTIVE_FRONT_THEME')
2222

2323

2424
def get_active_front_theme_version():
@@ -34,7 +34,7 @@ def get_active_front_theme_styles_url():
3434

3535

3636
def get_back_theme_dir():
37-
theme_dir = os.path.join(themes_path, "back", os.environ.get('ACTIVE_BACK_THEME', 'sneat'))
37+
theme_dir = os.path.join(themes_path, "back", get_value('ACTIVE_BACK_THEME'))
3838
return theme_dir
3939

4040

@@ -46,7 +46,7 @@ def get_back_theme_info_data():
4646

4747

4848
def get_active_back_theme():
49-
return os.environ.get('ACTIVE_BACK_THEME', 'sneat')
49+
return get_value('ACTIVE_BACK_THEME')
5050

5151

5252
def get_active_back_theme_version():

pythoncms/modules/box__default/theme/view.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# from shopyo.api.html import notify_success
1515
# from init import db
1616

17-
# from modules.box__default.settings.models import Settings
17+
from modules.box__default.keyvalue.helpers import get_value
1818

1919
# from shopyo.api.forms import flash_errors
2020

@@ -65,8 +65,8 @@ def index():
6565
with open(info_path) as f:
6666
all_back_info[folder] = json.load(f)
6767

68-
active_front_theme = os.environ.get('ACTIVE_FRONT_THEME', 'editorial')
69-
active_back_theme = os.environ.get('ACTIVE_BACK_THEME', 'SNEAT')
68+
active_front_theme = get_value('ACTIVE_FRONT_THEME')
69+
active_back_theme = get_value('ACTIVE_BACK_THEME')
7070

7171
context.update(
7272
{

0 commit comments

Comments
 (0)