Merge pull request #60 from NethServer/UIWording

change order PHP max execution time and file upload limit
NethServer · Mar 28, 2024 · 5a1b053 · 5a1b053
2 parents a30e7ed + 0d404e0
commit 5a1b053
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -56,7 +56,7 @@
     "select_php_memory_limit":"Script memory limit (MB)",
     "select_php_post_max_file_size_limit":"Maximum POST requests size (MB)",
     "select_php_upload_max_file_limit":"Maximum file size (MB)",
-    "select_php_max_execution_time_limit":"Maximum execution time (seconds)",
+    "select_php_max_execution_time_limit":"Maximum execution time in seconds (0 is unlimited)",
     "select_php_max_file_upload_limit":"Maximum file upload number",
     "Min":"min",
     "Max":"max",

diff --git a/ui/src/views/VirtualHosts.vue b/ui/src/views/VirtualHosts.vue
@@ -141,7 +141,7 @@
 
     <NsDangerDeleteModal
       :isShown="isShownDeleteVhostModal"
-      :name="currentVhost.ServerNames[0]"
+      :name="currentVhost.ServerNames[0] || ''"
       :title="$t('virtualhosts.delete')"
       :warning="$t('virtualhosts.please_read_carefully')"
       :description="$t('virtualhosts.delete_virtualhosts_confirm', { name: currentVhost.ServerNames[0]})"
@@ -300,25 +300,25 @@
                   </cv-slider>
                   <cv-slider
                     :light="true"
-                    :label="$t('virtualhosts.select_php_max_execution_time_limit')"
+                    :label="$t('virtualhosts.select_php_max_file_upload_limit')"
                     :disabled="loading.getConfiguration || loading.configureModule"
-                    :min="'0'"
-                    :max="'3600'"
-                    :value="MaxExecutionTime"
-                    v-model="MaxExecutionTime"
+                    :min="'20'"
+                    :max="'20000'"
+                    :value="MaxFileUploads"
+                    v-model="MaxFileUploads"
                     :step="'1'"
                     :step-multiplier="'1'"
                     :min-label="$t('virtualhosts.Min')"
                     :max-label="$t('virtualhosts.Max')">
                   </cv-slider>
                   <cv-slider
                     :light="true"
-                    :label="$t('virtualhosts.select_php_max_file_upload_limit')"
+                    :label="$t('virtualhosts.select_php_max_execution_time_limit')"
                     :disabled="loading.getConfiguration || loading.configureModule"
-                    :min="'20'"
-                    :max="'20000'"
-                    :value="MaxFileUploads"
-                    v-model="MaxFileUploads"
+                    :min="'0'"
+                    :max="'3600'"
+                    :value="MaxExecutionTime"
+                    v-model="MaxExecutionTime"
                     :step="'1'"
                     :step-multiplier="'1'"
                     :min-label="$t('virtualhosts.Min')"
@@ -370,7 +370,7 @@ export default {
       isEdit: false,
       isDisable:false,
       currentVhost: {
-        ServerNames:[],
+        ServerNames:[""],
         Port:"",
       },
       TitleEditModal:"",