CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't allow to add/update printers with empty hostname (#693)

Browse Source
This commit is contained in:
Stefan Dej 2022-03-04 19:19:41 +01:00 committed by GitHub
parent b3a0523624
commit a6b97f68e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/components/TheSelectPrinterDialog.vue
View File

@ -55,79 +55,83 @@
</v-card-text>
</template>
<template v-else-if="!isConnecting && dialogAddPrinter.bool">
<v-card-text>
<v-row>
<v-col class="col-8">
<v-text-field
v-model="dialogAddPrinter.hostname"
:rules="[
(v) => !!v || $t('SelectPrinterDialog.HostnameRequired'),
(v) => !v.startsWith('http:') || $t('SelectPrinterDialog.HostnameInvalid'),
(v) => !v.startsWith('https:') || $t('SelectPrinterDialog.HostnameInvalid'),
]"
label="Hostname/IP"
required
outlined
hide-details="auto"
dense></v-text-field>
</v-col>
<v-col class="col-4">
<v-text-field
v-model="dialogAddPrinter.port"
:rules="[(v) => !!v || $t('SelectPrinterDialog.PortRequired')]"
label="Port"
hide-details="auto"
required
outlined
dense></v-text-field>
</v-col>
</v-row>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" text class="middle" @click="addPrinter">
{{ $t('SelectPrinterDialog.AddPrinter') }}
</v-btn>
</v-card-actions>
<v-form v-model="addPrinterValid" @submit.prevent="addPrinter">
<v-card-text>
<v-row>
<v-col class="col-8">
<v-text-field
v-model="dialogAddPrinter.hostname"
:rules="[
(v) => !!v || $t('SelectPrinterDialog.HostnameRequired'),
(v) => !v.startsWith('http:') || $t('SelectPrinterDialog.HostnameInvalid'),
(v) => !v.startsWith('https:') || $t('SelectPrinterDialog.HostnameInvalid'),
]"
:label="$t('SelectPrinterDialog.HostnameIp')"
required
outlined
hide-details="auto"
dense></v-text-field>
</v-col>
<v-col class="col-4">
<v-text-field
v-model="dialogAddPrinter.port"
:rules="[(v) => !!v || $t('SelectPrinterDialog.PortRequired')]"
:label="$t('SelectPrinterDialog.Port')"
hide-details="auto"
required
outlined
dense></v-text-field>
</v-col>
</v-row>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" text class="middle" type="submit" :disabled="!addPrinterValid">
{{ $t('SelectPrinterDialog.AddPrinter') }}
</v-btn>
</v-card-actions>
</v-form>
</template>
<template v-else-if="!isConnecting && dialogEditPrinter.bool">
<v-card-text>
<v-row>
<v-col class="col-8">
<v-text-field
v-model="dialogEditPrinter.hostname"
:rules="[
(v) => !!v || $t('SelectPrinterDialog.HostnameRequired'),
(v) => !v.startsWith('http:') || $t('SelectPrinterDialog.HostnameInvalid'),
(v) => !v.startsWith('https:') || $t('SelectPrinterDialog.HostnameInvalid'),
]"
label="Hostname/IP"
required
outlined
dense
hide-details="auto"></v-text-field>
</v-col>
<v-col class="col-4">
<v-text-field
v-model="dialogEditPrinter.port"
:rules="[(v) => !!v || $t('SelectPrinterDialog.PortRequired')]"
label="Port"
required
outlined
dense
hide-details="auto"></v-text-field>
</v-col>
</v-row>
</v-card-text>
<v-card-actions>
<v-btn color="red" icon tile class="minwidth-0 rounded" @click="delPrinter">
<v-icon small>{{ mdiDelete }}</v-icon>
</v-btn>
<v-spacer></v-spacer>
<v-btn color="primary" text @click="updatePrinter">
{{ $t('SelectPrinterDialog.UpdatePrinter') }}
</v-btn>
</v-card-actions>
<v-form v-model="editPrinterValid" @submit.prevent="updatePrinter">
<v-card-text>
<v-row>
<v-col class="col-8">
<v-text-field
v-model="dialogEditPrinter.hostname"
:rules="[
(v) => !!v || $t('SelectPrinterDialog.HostnameRequired'),
(v) => !v.startsWith('http:') || $t('SelectPrinterDialog.HostnameInvalid'),
(v) => !v.startsWith('https:') || $t('SelectPrinterDialog.HostnameInvalid'),
]"
:label="$t('SelectPrinterDialog.HostnameIp')"
required
outlined
dense
hide-details="auto"></v-text-field>
</v-col>
<v-col class="col-4">
<v-text-field
v-model="dialogEditPrinter.port"
:rules="[(v) => !!v || $t('SelectPrinterDialog.PortRequired')]"
:label="$t('SelectPrinterDialog.Port')"
required
outlined
dense
hide-details="auto"></v-text-field>
</v-col>
</v-row>
</v-card-text>
<v-card-actions>
<v-btn color="red" icon tile class="minwidth-0 rounded" @click="delPrinter">
<v-icon small>{{ mdiDelete }}</v-icon>
</v-btn>
<v-spacer></v-spacer>
<v-btn color="primary" text type="submit" :disabled="!editPrinterValid">
{{ $t('SelectPrinterDialog.UpdatePrinter') }}
</v-btn>
</v-card-actions>
</v-form>
</template>
<template v-else>
<v-card-text class="mt-3">
@ -219,11 +223,13 @@ import {
components: { Panel },
})
export default class TheSelectPrinterDialog extends Mixins(BaseMixin) {
private addPrinterValid = false
private dialogAddPrinter = {
bool: false,
hostname: '',
port: 7125,
}
private editPrinterValid = false
private dialogEditPrinter = {
bool: false,
id: '',

2
src/locales/en.json
View File

@ -116,6 +116,8 @@
"EditPrinter": "Edit Printer",
"UpdatePrinter": "Update Printer",
"ChangePrinter": "Change Printer",
"HostnameIp": "Hostname/IP",
"Port": "Port",
"HostnameRequired": "Hostname is required",
"HostnameInvalid": "invalid Hostname/IP",
"PortRequired": "Port is required",