Merge pull request #49 from NethServer/fixIntegerTypeOfPort

Update SFTP TCP Port placeholder and type NethServer/dev#6788
NethServer · Dec 6, 2023 · 776f6e4 · 776f6e4
2 parents 206688c + 26942ca
commit 776f6e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -4,7 +4,8 @@
     "work_in_progress": "Work in progress",
     "processing": "Processing...",
     "enabled":"Enabled",
-    "disabled":"Disabled"
+    "disabled":"Disabled",
+    "eg_value": "E.g. {value}"
   },
   "status": {
     "title": "Status",
@@ -91,7 +92,7 @@
     "path_pattern": "Web path for the web application, like '/sftpgo'",
     "webpath_already_used_in_traefik": "This web path is already used by another application in the web proxy.",
     "sftp_tcp_port": "External sftp TCP port",
-    "sftp_tcp_port_tips": "This port is needed to connect a sftp client to the sftp server: sftp -P port_number user@hostname",
+    "sftp_tcp_port_tips": "This port is needed to connect a sftp client to the sftp server: sftp -P {port} user@hostname",
     "save": "Save",
     "lets_encrypt": "Let's Encrypt",
     "http_to_https": "HTTP to HTTPS",

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -32,7 +32,8 @@
               </cv-text-input>
               <NsTextInput
                 :label="$t('settings.sftp_tcp_port')"
-                placeholder="3092"
+                :placeholder="$t('common.eg_value', {value: '3092'})"
+                type="number"
                 v-model.trim="sftp_tcp_port"
                 class="mg-bottom"
                 :invalid-message="$t(error.sftp_tcp_port)"
@@ -44,7 +45,7 @@
                 <template slot="tooltip">
                   <div
                     v-html="
-                      $t('settings.sftp_tcp_port_tips')
+                      $t('settings.sftp_tcp_port_tips', {port: sftp_tcp_port || '{tcp_port}'})
                     "
                   ></div>
                 </template>
@@ -214,7 +215,7 @@ export default {
     getConfigurationCompleted(taskContext, taskResult) {
       const config = taskResult.output;
       this.path = config.path;
-      this.sftp_tcp_port = config.sftp_tcp_port;
+      this.sftp_tcp_port = config.sftp_tcp_port.toString();
       this.isHttpToHttpsEnabled = config.http2https;
       this.isSftpgoPortEnabled = config.sftpgo_service
       this.loading.getConfiguration = false;