diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-11-19 01:50:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 01:50:52 +0000 |
| commit | 7721e43e8b684e9b46c7294e961f57f9d5f1baf3 (patch) | |
| tree | 1a33b694f5a50b93adc2493750dc84f751b34b74 | |
| parent | 3cbc0a93f779882d133873c81b5b720f52e45975 (diff) | |
| parent | dcb277ba0aed4a02f48572d10d3ba242942b8639 (diff) | |
| download | vyos-1x-7721e43e8b684e9b46c7294e961f57f9d5f1baf3.tar.gz vyos-1x-7721e43e8b684e9b46c7294e961f57f9d5f1baf3.zip | |
Merge pull request #2504 from c-po/commit-archive-help
config-mgmt: T4957: T2405: add proper valueHelp strings for remote URL
| -rw-r--r-- | interface-definitions/system-config-mgmt.xml.in | 28 | ||||
| -rwxr-xr-x | scripts/build-command-templates | 2 |
2 files changed, 28 insertions, 2 deletions
diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in index 794f9f1a0..b01b44bf9 100644 --- a/interface-definitions/system-config-mgmt.xml.in +++ b/interface-definitions/system-config-mgmt.xml.in @@ -17,8 +17,32 @@ <properties> <help>Commit archive location</help> <valueHelp> - <format>uri</format> - <description>Uniform Resource Identifier</description> + <format>http://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>https://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>ftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>sftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>scp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>tftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>git+https://<user>:<passwd>@<host>/<path></format> + <description/> </valueHelp> <constraint> <validator name="url --file-transport"/> diff --git a/scripts/build-command-templates b/scripts/build-command-templates index c8ae83d9d..2e7f8b994 100755 --- a/scripts/build-command-templates +++ b/scripts/build-command-templates @@ -145,6 +145,8 @@ def get_properties(p, default=None): description = v.find("description").text if default != None and default.text == format: description += f' (default)' + # Is no description was specified, keep it empty + if not description: description = '' vh.append( (format, description) ) props["val_help"] = vh except: |