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

[fix] Get / set app config panel

Browse source
This commit is contained in:
ljf 2021-09-04 20:12:56 +02:00
parent 8eaaf0975a
commit 4c9fcdc9e4
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/yunohost/app.py
View file

@ -1800,7 +1800,8 @@ class AppConfigPanel(ConfigPanel):
self.values = self._call_config_script("show") self.values = self._call_config_script("show")
def _apply(self): def _apply(self):
self.errors = self._call_config_script("apply", self.new_values) env = {key: str(value) for key, value in self.new_values.items()}
self.errors = self._call_config_script("apply", env=env)
def _call_config_script(self, action, env={}): def _call_config_script(self, action, env={}):
from yunohost.hook import hook_exec from yunohost.hook import hook_exec

5
src/yunohost/utils/config.py
View file

@ -81,7 +81,8 @@ class ConfigPanel:
key = f"{panel['id']}.{section['id']}.{option['id']}" key = f"{panel['id']}.{section['id']}.{option['id']}"
if mode == 'export': if mode == 'export':
result[option['id']] = option.get('current_value') result[option['id']] = option.get('current_value')
elif 'ask' in option: else:
if 'ask' in option:
result[key] = {'ask': _value_for_locale(option['ask'])} result[key] = {'ask': _value_for_locale(option['ask'])}
elif 'i18n' in self.config: elif 'i18n' in self.config:
result[key] = {'ask': m18n.n(self.config['i18n'] + '_' + option['id'])} result[key] = {'ask': m18n.n(self.config['i18n'] + '_' + option['id'])}
@ -774,7 +775,7 @@ class FileQuestion(Question):
def __init__(self, question, user_answers): def __init__(self, question, user_answers):
super().__init__(question, user_answers) super().__init__(question, user_answers)
if self.get("accept"): if question.get("accept"):
self.accept = question.get("accept").replace(" ", "").split(",") self.accept = question.get("accept").replace(" ", "").split(",")
else: else:
self.accept = [] self.accept = []