YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

settings: fix output format for 'yunohost settings list'

Browse source
This commit is contained in:
Alexandre Aubin 2022-11-27 00:32:08 +01:00
parent 080988d20e
commit 70bf38ce25
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/settings.py
View file

@ -53,24 +53,19 @@ def settings_get(key="", full=False, export=False):
else: else:
mode = "classic" mode = "classic"
if mode == "classic" and key == "":
raise YunohostValidationError("Missing key", raw_msg=True)
settings = SettingsConfigPanel() settings = SettingsConfigPanel()
key = translate_legacy_settings_to_configpanel_settings(key) key = translate_legacy_settings_to_configpanel_settings(key)
return settings.get(key, mode) return settings.get(key, mode)
def settings_list(full=False, export=True): def settings_list(full=False):
"""
List all entries of the settings
""" settings = settings_get(full=full)
if full: if full:
export = False return settings
else:
return settings_get(full=full, export=export) return {k: v for k, v in settings.items() if not k.startswith("security.root_access")}
@is_unit_operation() @is_unit_operation()

2
src/tests/test_settings.py
View file

@ -207,7 +207,7 @@ def test_settings_set_bad_value_select():
def test_settings_list_modified(): def test_settings_list_modified():
settings_set("example.example.number", 21) settings_set("example.example.number", 21)
assert settings_list()["number"] == 21 assert settings_list()["example.example.number"]["value"] == 21
def test_reset(): def test_reset():