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

Merge pull request #1427 from Tagadda/fix-appinstall

Browse source 
[fix] Compute choices for the yunohost admin when installing an app
This commit is contained in:
Alexandre Aubin 2022-01-29 15:45:38 +01:00 • committed by GitHub
commit 3a85b5201a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app.py
View file

@ -57,6 +57,7 @@ from yunohost.utils.config import (
ask_questions_and_parse_answers,
DomainQuestion,
PathQuestion,
hydrate_questions_with_choices,
)
from yunohost.utils.i18n import _value_for_locale
from yunohost.utils.error import YunohostError, YunohostValidationError
@ -678,6 +679,9 @@ def app_manifest(app):
shutil.rmtree(extracted_app_folder)
raw_questions = manifest.get("arguments", {}).get("install", [])
manifest['arguments']['install'] = hydrate_questions_with_choices(raw_questions)
return manifest

16
src/utils/config.py
View file

@ -1114,7 +1114,7 @@ class DomainQuestion(Question):
self.default = _get_maindomain()
self.choices = {
domain: domain + " ★" if domain == self.default else ""
domain: domain + " ★" if domain == self.default else domain
for domain in domain_list()["domains"]
}
@ -1178,7 +1178,7 @@ class UserQuestion(Question):
if self.default is None:
root_mail = "root@%s" % _get_maindomain()
for user in self.choices:
for user in self.choices.keys():
if root_mail in user_info(user).get("mail-aliases", []):
self.default = user
break
@ -1396,3 +1396,15 @@ def ask_questions_and_parse_answers(
out.append(question)
return out
def hydrate_questions_with_choices(raw_questions: List) -> List:
out = []
for raw_question in raw_questions:
question = ARGUMENTS_TYPE_PARSERS[raw_question.get("type", "string")](raw_question)
if question.choices:
raw_question["choices"] = question.choices
raw_question["default"] = question.default
out.append(raw_question)
return out