Merge 484098e into 92bca23

openhab · Feb 10, 2023 · dff3045 · dff3045
2 parents 92bca23 + 484098e
commit dff3045
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/item/item-form.vue b/bundles/org.openhab.ui/web/src/components/item/item-form.vue
@@ -1,9 +1,10 @@
 <template>
   <div v-if="item" class="quick-link-form no-padding">
     <f7-list inline-labels no-hairlines-md>
-      <f7-list-input v-if="!enableName" label="Name" type="text" placeholder="Name" :value="item.name" disabled />
-      <f7-list-input v-else label="Name" type="text" placeholder="Name" :value="item.name"
-                     @input="onNameInput" clear-button required :error-message="nameErrorMessage" :error-message-force="!!nameErrorMessage" />
+      <f7-list-input label="Name" type="text" placeholder="Required" :value="item.name"
+                     :disabled="!enableName" :info="(enableName) ? 'Note: cannot be changed after the creation' : ''"
+                     required :error-message="nameErrorMessage" :error-message-force="!!nameErrorMessage"
+                     @input="onNameInput" :clear-button="enableName" />
       <f7-list-input label="Label" type="text" placeholder="Label" :value="item.label"
                      @input="item.label = $event.target.value" clear-button />
       <f7-list-item v-if="item.type && !hideType" title="Type" type="text" smart-select :smart-select-params="{searchbar: true, openIn: 'popup', closeOnSelect: true}">
@@ -78,9 +79,9 @@ export default {
     validateName (name) {
       let oldError = this.nameErrorMessage
       if (!/^[A-Za-z0-9_]+$/.test(name)) {
-        this.nameErrorMessage = 'Required. Alphanumeric & underscores only'
+        this.nameErrorMessage = 'Required. A-Z,a-z,0-9,_ only'
       } else if (this.items.some(item => item.name === name)) {
-        this.nameErrorMessage = 'An item with this name already exists'
+        this.nameErrorMessage = 'An Item with this name already exists'
       } else {
         this.nameErrorMessage = ''
       }