mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
domain:configpanel: update recovery_password
check to new configpanel syntax
This commit is contained in:
parent
ec2ffe6813
commit
5a655ba8cf
1 changed files with 4 additions and 12 deletions
|
@ -735,19 +735,11 @@ class DomainConfigPanel(ConfigPanel):
|
||||||
domain=self.entity,
|
domain=self.entity,
|
||||||
other_app=app_map(raw=True)[self.entity]["/"]["id"],
|
other_app=app_map(raw=True)[self.entity]["/"]["id"],
|
||||||
)
|
)
|
||||||
if (
|
|
||||||
"recovery_password" in self.new_values
|
if next_settings.get("recovery_password", None):
|
||||||
and self.new_values["recovery_password"]
|
|
||||||
):
|
|
||||||
domain_dyndns_set_recovery_password(
|
domain_dyndns_set_recovery_password(
|
||||||
self.entity, self.new_values["recovery_password"]
|
self.entity, form["recovery_password"]
|
||||||
)
|
)
|
||||||
# Do not save password in yaml settings
|
|
||||||
if "recovery_password" in self.values:
|
|
||||||
del self.values["recovery_password"]
|
|
||||||
if "recovery_password" in self.new_values:
|
|
||||||
del self.new_values["recovery_password"]
|
|
||||||
assert "recovery_password" not in self.future_values
|
|
||||||
|
|
||||||
portal_options = [
|
portal_options = [
|
||||||
"default_app",
|
"default_app",
|
||||||
|
@ -780,7 +772,7 @@ class DomainConfigPanel(ConfigPanel):
|
||||||
str(portal_settings_path), portal_settings, sort_keys=True, indent=4
|
str(portal_settings_path), portal_settings, sort_keys=True, indent=4
|
||||||
)
|
)
|
||||||
|
|
||||||
super()._apply(form, previous_settings)
|
super()._apply(form, previous_settings, exclude={"recovery_password"})
|
||||||
|
|
||||||
# Reload ssowat if default app changed
|
# Reload ssowat if default app changed
|
||||||
if "default_app" in next_settings:
|
if "default_app" in next_settings:
|
||||||
|
|
Loading…
Add table
Reference in a new issue