mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
settings: fix output format for 'yunohost settings list'
This commit is contained in:
parent
080988d20e
commit
70bf38ce25
2 changed files with 6 additions and 11 deletions
|
@ -53,24 +53,19 @@ def settings_get(key="", full=False, export=False):
|
|||
else:
|
||||
mode = "classic"
|
||||
|
||||
if mode == "classic" and key == "":
|
||||
raise YunohostValidationError("Missing key", raw_msg=True)
|
||||
|
||||
settings = SettingsConfigPanel()
|
||||
key = translate_legacy_settings_to_configpanel_settings(key)
|
||||
return settings.get(key, mode)
|
||||
|
||||
|
||||
def settings_list(full=False, export=True):
|
||||
"""
|
||||
List all entries of the settings
|
||||
def settings_list(full=False):
|
||||
|
||||
"""
|
||||
settings = settings_get(full=full)
|
||||
|
||||
if full:
|
||||
export = False
|
||||
|
||||
return settings_get(full=full, export=export)
|
||||
return settings
|
||||
else:
|
||||
return {k: v for k, v in settings.items() if not k.startswith("security.root_access")}
|
||||
|
||||
|
||||
@is_unit_operation()
|
||||
|
|
|
@ -207,7 +207,7 @@ def test_settings_set_bad_value_select():
|
|||
|
||||
def test_settings_list_modified():
|
||||
settings_set("example.example.number", 21)
|
||||
assert settings_list()["number"] == 21
|
||||
assert settings_list()["example.example.number"]["value"] == 21
|
||||
|
||||
|
||||
def test_reset():
|
||||
|
|
Loading…
Add table
Reference in a new issue