This commit is contained in:
2020-06-06 23:25:11 +00:00
parent b83f37e7ca
commit ffef3880d3
5 changed files with 33 additions and 4 deletions

View File

@@ -8,6 +8,10 @@ WIFI change 5g channel to 52,56,60 and 2g channel to 8
todo: readonly not enough, sb disabled as well, check widget and anywhere readonly is set and examine to see if that's a good change
todo: if widget is readonly customize still shows
it's read only (but looks enabled)
should it even show as a menu option? (probably not)
todo: PickList, hide open button if disabled and show an active button so user can still click, that's not restricted when readonly
todo: Administration - License
- view

View File

@@ -9,6 +9,7 @@
locale: languageName
}"
:readonly="readonly"
:disabled="disabled"
:label="label"
:rules="rules"
></v-text-field>
@@ -41,6 +42,7 @@ export default {
rules: Array,
value: { type: Number, default: null },
readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false },
error: {
type: String,
required: false

View File

@@ -20,6 +20,7 @@
<gz-date-time-picker
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -40,6 +41,7 @@
<gz-date-picker
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -59,6 +61,7 @@
<gz-time-picker
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -78,6 +81,7 @@
<v-textarea
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -99,6 +103,7 @@
<v-text-field
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -122,6 +127,7 @@
<v-checkbox
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -141,6 +147,7 @@
<gz-decimal
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -160,6 +167,7 @@
<gz-currency
v-model="_self[item.dataKey]"
:readonly="readonly"
:disabled="disabled"
:label="$ay.t(item.fld)"
:ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false"
@@ -202,6 +210,7 @@ export default {
},
formKey: String, //used to grab template from store
readonly: Boolean,
disabled: Boolean,
parentVM: Object
},

View File

@@ -4,6 +4,7 @@
v-bind:value="value"
v-on:input="selectionMade($event)"
:readonly="readonly"
:disabled="disabled"
return-object
:items="searchResults"
:label="label"
@@ -62,6 +63,7 @@ export default {
default: null
},
readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false },
ayaType: {
type: Number,
default: 0

View File

@@ -10,6 +10,7 @@
<v-text-field
v-model="obj.name"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:clearable="!formState.readOnly"
@click:clear="fieldValueChanged('name')"
:counter="255"
@@ -34,6 +35,7 @@
<v-text-field
v-model="obj.serial"
:readonly="true"
:disabled="formState.readOnly"
:label="$ay.t('WidgetSerial')"
:data-cy="!!$ay.dev ? 'serial' : false"
></v-text-field>
@@ -48,6 +50,7 @@
<v-text-field
v-model="obj.count"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:clearable="!formState.readOnly"
@click:clear="fieldValueChanged('count')"
:counter="10"
@@ -71,6 +74,7 @@
<gz-currency
v-model="obj.dollarAmount"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:label="$ay.t('WidgetDollarAmount')"
ref="dollarAmount"
:data-cy="!!$ay.dev ? 'dollarAmount' : false"
@@ -88,6 +92,7 @@
:label="$ay.t('WidgetStartDate')"
v-model="obj.startDate"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
ref="startDate"
testId="startDate"
:error-messages="form().serverErrors(this, 'startDate')"
@@ -102,6 +107,7 @@
:error-messages="form().serverErrors(this, 'endDate')"
v-model="obj.endDate"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
ref="endDate"
testId="endDate"
@input="fieldValueChanged('endDate')"
@@ -117,6 +123,7 @@
<v-checkbox
v-model="obj.active"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:label="$ay.t('Active')"
ref="active"
:data-cy="!!$ay.dev ? 'active' : false"
@@ -137,6 +144,7 @@
:showEditIcon="true"
v-model="obj.userId"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:label="$ay.t('User')"
ref="userid"
:data-cy="!!$ay.dev ? 'userid' : false"
@@ -158,6 +166,7 @@
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:label="$ay.t('UserType')"
ref="usertype"
:data-cy="!!$ay.dev ? 'usertype' : false"
@@ -171,6 +180,7 @@
<v-textarea
v-model="obj.notes"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:label="$ay.t('WidgetNotes')"
:error-messages="form().serverErrors(this, 'notes')"
ref="notes"
@@ -185,6 +195,7 @@
<gz-tag-picker
v-model="obj.tags"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
ref="tags"
:data-cy="!!$ay.dev ? 'tags' : false"
:error-messages="form().serverErrors(this, 'tags')"
@@ -197,6 +208,7 @@
v-model="obj.customFields"
:formKey="formCustomTemplateKey"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:parentVM="this"
ref="customFields"
:data-cy="!!$ay.dev ? 'customFields' : false"
@@ -212,6 +224,7 @@
ref="wiki"
v-model="obj.wiki"
:readonly="formState.readOnly"
:disabled="formState.readOnly"
@input="fieldValueChanged('wiki')"
></gz-wiki
></v-col>
@@ -222,6 +235,7 @@
>
<gz-attachments
:readonly="formState.readOnly"
:disabled="formState.readOnly"
:ayaType="ayaType"
:ayaId="obj.id"
></gz-attachments
@@ -256,21 +270,19 @@ export default {
initForm(vm)
.then(() => {
vm.rights = window.$gz.role.getRights(window.$gz.type.Widget);
vm.formState.readOnly = !vm.rights.change;
window.$gz.eventBus.$on("menu-click", clickHandler);
//id 0 means create a new record don't load one
if (vm.$route.params.recordid != 0) {
vm.getDataFromApi(vm.$route.params.recordid);
} else {
//setup for new record
let readOnly = !vm.rights.change;
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
loading: false,
readOnly: readOnly
loading: false
});
// //bugbug WTF? This doesn't make sense, if it's an attempt to hide delete button then that's wrong