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

configpanels: config_get should return possible choices for domain, user questions (and other dynamic-choices questions)

Browse source
This commit is contained in:
Alexandre Aubin 2022-01-21 20:05:59 +01:00
parent 5d0f8021b8
commit 2f7ec5b368
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/config.py
View file

@ -285,8 +285,10 @@ class ConfigPanel:
ask = m18n.n(self.config["i18n"] + "_" + option["id"])
if mode == "full":
# edit self.config directly
option["ask"] = ask
question_class = ARGUMENTS_TYPE_PARSERS[option.get("type", "string")]
# FIXME : maybe other properties should be taken from the question, not just choices ?.
option["choices"] = question_class(option).choices
else:
result[key] = {"ask": ask}
if "current_value" in option:
@ -1109,7 +1111,7 @@ class DomainQuestion(Question):
if self.default is None:
self.default = _get_maindomain()
self.choices = domain_list()["domains"]
self.choices = {domain: domain + ' ★' if domain == self.default else '' for domain in domain_list()['domains']}
@staticmethod
def normalize(value, option={}):
@ -1134,7 +1136,9 @@ class UserQuestion(Question):
from yunohost.domain import _get_maindomain
super().__init__(question, context, hooks)
self.choices = list(user_list()["users"].keys())
self.choices = {username: f"{infos['fullname']} ({infos['mail']})"
for username, infos in user_list()["users"].items()}
if not self.choices:
raise YunohostValidationError(