This commit is contained in:
2020-06-21 20:06:07 +00:00
parent 975302d98a
commit e4fd02bbaa
2 changed files with 11 additions and 9 deletions

View File

@@ -4,7 +4,8 @@
<v-row v-if="formState.ready"> <v-row v-if="formState.ready">
<v-col> <v-col>
<v-form ref="form"> <v-form ref="form">
todo: set password, maybe set user options? todo: set password, maybe set user options? todo: show lastlogin on
list and in form as readonly
<v-row> <v-row>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
@@ -35,10 +36,7 @@
@click:clear="fieldValueChanged('employeeNumber')" @click:clear="fieldValueChanged('employeeNumber')"
:counter="255" :counter="255"
:label="$ay.t('UserEmployeeNumber')" :label="$ay.t('UserEmployeeNumber')"
:rules="[ :rules="[form().max255(this, 'employeeNumber')]"
form().max255(this, 'employeeNumber'),
form().required(this, 'employeeNumber')
]"
:error-messages="form().serverErrors(this, 'employeeNumber')" :error-messages="form().serverErrors(this, 'employeeNumber')"
ref="employeeNumber" ref="employeeNumber"
:data-cy="!!$ay.dev ? 'employeeNumber' : false" :data-cy="!!$ay.dev ? 'employeeNumber' : false"
@@ -288,10 +286,10 @@ export default {
obj: { obj: {
id: 0, id: 0,
concurrency: 0, concurrency: 0,
active: null, active: false,
name: null, name: null,
roles: null, roles: null,
userType: 0, userType: 3,
employeeNumber: null, employeeNumber: null,
notes: null, notes: null,
customerId: null, customerId: null,
@@ -442,6 +440,10 @@ export default {
submitObject.login = vm.login; submitObject.login = vm.login;
} }
if (submitObject.roles == null) {
submitObject.roles = 0;
}
let res = await window.$gz.api.upsert(url, submitObject); let res = await window.$gz.api.upsert(url, submitObject);
vm.formState.loading = false; vm.formState.loading = false;
if (res.error) { if (res.error) {

View File

@@ -25,7 +25,7 @@ export default {
data() { data() {
return { return {
currentListViewId: 1, currentListViewId: 1,
dataListKey: "TestUserDataList", //maybe special admin version? More stuff on it dataListKey: "UserDataList",
dataListFilter: "", dataListFilter: "",
dataListSort: "", dataListSort: "",
rights: window.$gz.role.defaultRightsObject() rights: window.$gz.role.defaultRightsObject()
@@ -50,7 +50,7 @@ function clickHandler(menuItem) {
switch (m.key) { switch (m.key) {
case "new": case "new":
m.vm.$router.push({ m.vm.$router.push({
name: "user-edit", name: "adm-user",
params: { recordid: 0 } params: { recordid: 0 }
}); });
break; break;