Skip to content

Commit d129048

Browse files
author
Thomas Hanke
committed
some code formating
1 parent 97882fa commit d129048

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

ckanext/matolabtheme/auth.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# import ckanext.datastore.logic.auth as auth
2-
import ckan.plugins.toolkit as toolkit
32
from typing import Any
43

4+
import ckan.plugins.toolkit as toolkit
5+
56
if toolkit.check_ckan_version("2.10"):
67
from ckan.types import Context
78
else:

ckanext/matolabtheme/plugin.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import ckan.plugins as plugins
22
import ckan.plugins.toolkit as toolkit
33
from ckan.config.declaration import Declaration, Key
4-
from ckanext.matolabtheme import helpers, views, action, auth
54
from ckan.lib.plugins import DefaultTranslation
65

7-
8-
log = __import__("logging").getLogger(__name__)
9-
6+
from ckanext.matolabtheme import action, auth, helpers, views
107

118

129
class MatolabthemePlugin(plugins.SingletonPlugin, DefaultTranslation):
@@ -43,7 +40,7 @@ def declare_config_options(self, declaration: Declaration, key: Key):
4340
group.dsvgo_contact_md,
4441
"legal person name, street number, Zip city, country",
4542
)
46-
option=declaration.declare_bool(group.dark_mode, False)
43+
option = declaration.declare_bool(group.dark_mode, False)
4744
option.set_validators("not_missing boolean_validator")
4845
declaration.declare(group.banner_top, "/static/banner_top.png")
4946
declaration.declare(group.banner_top_upload, "")
@@ -58,9 +55,9 @@ def declare_config_options(self, declaration: Declaration, key: Key):
5855
def update_config_schema(self, schema):
5956

6057
ignore_missing = toolkit.get_validator("ignore_missing")
61-
bool_val = toolkit.get_validator("boolean_validator")
58+
# bool_val = toolkit.get_validator("boolean_validator")
6259
unicode_safe = toolkit.get_validator("unicode_safe")
63-
dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
60+
# dark_mode = toolkit.config.get("ckanext.matolabtheme.dark_mode")
6461
schema.update(
6562
{
6663
# This is an existing CKAN core configuration option, we are just
@@ -108,7 +105,6 @@ def update_config_schema(self, schema):
108105
)
109106
return schema
110107

111-
112108
# ITemplateHelpers
113109

114110
def get_helpers(self):

ckanext/matolabtheme/views.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
import os
2-
from flask import Blueprint
3-
from flask.views import MethodView
41
import ckan.lib.base as base
52
import ckan.plugins.toolkit as toolkit
3+
from flask import Blueprint
4+
from flask.views import MethodView
65

7-
log = __import__("logging").getLogger(__name__)
8-
9-
blueprint = Blueprint("matolabtheme", __name__)
6+
from typing import Any, Union
107

11-
import ckan.logic.schema
12-
from ckan.common import _, config, request, current_user
138
import ckan.lib.navl.dictization_functions as dict_fns
14-
from ckan.views.home import CACHE_PARAMETERS
9+
import ckan.lib.uploader as uploader
1510
import ckan.logic as logic
16-
from typing import Any, Union
17-
from flask.wrappers import Response
11+
import ckan.logic.schema
12+
import ckan.model as model
13+
from ckan.common import _, config, current_user, request
1814
from ckan.lib.helpers import helper_functions as h
15+
from ckan.views.home import CACHE_PARAMETERS
16+
from flask.wrappers import Response
1917

18+
log = __import__("logging").getLogger(__name__)
2019

21-
import ckan.model as model
22-
from ckan.common import request
23-
import ckan.lib.uploader as uploader
20+
blueprint = Blueprint("matolabtheme", __name__)
2421

2522
if toolkit.check_ckan_version(min_version="2.10"):
2623
from ckan.types import Context
2724
else:
25+
2826
class Context(dict):
2927
def __init__(self, **kwargs):
3028
super().__init__(**kwargs)
3129

30+
3231
class ThemeConfigView(MethodView):
3332
def post(self) -> Union[str, Response]:
3433
try:
@@ -49,9 +48,11 @@ def post(self) -> Union[str, Response]:
4948
)
5049
)
5150
)
52-
dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
51+
# dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
5352
# Set dark_mode based on whether the checkbox was checked
54-
data_dict['ckanext.matolabtheme.dark_mode'] = 'ckanext.matolabtheme.dark_mode' in req
53+
data_dict["ckanext.matolabtheme.dark_mode"] = (
54+
"ckanext.matolabtheme.dark_mode" in req
55+
)
5556
del data_dict["save"]
5657
# data = logic.get_action("config_option_update")(
5758
# {"user": current_user.name}, data_dict
@@ -106,7 +107,7 @@ def post(self) -> Union[str, Response]:
106107
value = data_dict[key]
107108
model.set_system_info(key, value)
108109
config[key] = value
109-
110+
110111
except logic.ValidationError as e:
111112
data = request.form
112113
errors = e.error_dict
@@ -124,7 +125,7 @@ def get(self) -> str:
124125
logic.check_access("sysadmin", context)
125126
except logic.NotAuthorized:
126127
base.abort(403, _("Need to be system administrator to administer"))
127-
dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
128+
# dark_mode = toolkit.config.get("ckanext.matolabtheme.dark_mode")
128129
schema = ckan.logic.schema.update_configuration_schema()
129130
data = {}
130131
for key in schema:

0 commit comments

Comments
 (0)