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

domains: simplify domain config panel cert section

Browse source
This commit is contained in:
Alexandre Aubin 2022-10-08 19:21:36 +02:00
parent 403efe4873
commit a355f48580
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
share/config_domain.toml
View file

@ -63,21 +63,18 @@ name = "DNS"
[cert] [cert]
name = "Certificate" name = "Certificate"
[cert.status] [cert.cert]
name = "Status"
[cert.status.cert_summary] [cert.cert.cert_summary]
type = "alert" type = "alert"
# Automatically filled by DomainConfigPanel # Automatically filled by DomainConfigPanel
[cert.status.cert_validity] [cert.cert.cert_validity]
type = "number" type = "number"
readonly = true readonly = true
visible = "false"
# Automatically filled by DomainConfigPanel # Automatically filled by DomainConfigPanel
[cert.cert]
name = "Manage"
[cert.cert.cert_issuer] [cert.cert.cert_issuer]
type = "string" type = "string"
visible = false visible = false

4
src/domain.py
View file

@ -573,14 +573,14 @@ class DomainConfigPanel(ConfigPanel):
from yunohost.certificate import certificate_status from yunohost.certificate import certificate_status
status = certificate_status([self.entity], full=True)["certificates"][self.entity] status = certificate_status([self.entity], full=True)["certificates"][self.entity]
toml["cert"]["status"]["cert_summary"]["style"] = status["style"] toml["cert"]["cert"]["cert_summary"]["style"] = status["style"]
# i18n: domain_config_cert_summary_expired # i18n: domain_config_cert_summary_expired
# i18n: domain_config_cert_summary_selfsigned # i18n: domain_config_cert_summary_selfsigned
# i18n: domain_config_cert_summary_abouttoexpire # i18n: domain_config_cert_summary_abouttoexpire
# i18n: domain_config_cert_summary_ok # i18n: domain_config_cert_summary_ok
# i18n: domain_config_cert_summary_letsencrypt # i18n: domain_config_cert_summary_letsencrypt
toml["cert"]["status"]["cert_summary"]["ask"] = m18n.n(f"domain_config_cert_summary_{status['summary']}") toml["cert"]["cert"]["cert_summary"]["ask"] = m18n.n(f"domain_config_cert_summary_{status['summary']}")
# Other specific strings used in config panels # Other specific strings used in config panels
# i18n: domain_config_cert_renew_help # i18n: domain_config_cert_renew_help