This commit is contained in:
@@ -564,12 +564,12 @@ export default {
|
||||
// NOTE: that in a form this should only be used with non stock-required fields, if they are already required they cannot be hidden
|
||||
//
|
||||
showMe(vm, formCustomTemplateFieldName) {
|
||||
//special check for wikiContent
|
||||
//special check for wiki field
|
||||
//if read only then can't add any content and if no content then no reason to show it at all
|
||||
if (formCustomTemplateFieldName == "wikiContent") {
|
||||
if (formCustomTemplateFieldName == "wiki") {
|
||||
if (
|
||||
vm.formState.readOnly &&
|
||||
(vm.obj.wikiContent == null || vm.obj.wikiContent.length == 0)
|
||||
(vm.obj.wiki == null || vm.obj.wiki.length == 0)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -815,9 +815,8 @@ export default {
|
||||
|
||||
|
||||
|
||||
todo: widget form, remove wiki menu option
|
||||
|
||||
todo: Add wikiContent field to form defintions at server so can hide or show in form customization
|
||||
todo: Add wiki field to form defintions at server so can hide or show in form customization
|
||||
- Also for dataLists? (for reporting not grid I mean)
|
||||
|
||||
todo: event log type just for edit wiki?
|
||||
|
||||
@@ -205,13 +205,13 @@
|
||||
></gz-custom-fields>
|
||||
</v-col>
|
||||
<!-- Show the wiki unless hidden by form customization or not read only, or if it has content -->
|
||||
<v-col v-if="form().showMe(this, 'wikiContent')" cols="12">
|
||||
<v-col v-if="form().showMe(this, 'wiki')" cols="12">
|
||||
<gz-wiki
|
||||
ref="wikiContent"
|
||||
v-model="obj.wikiContent"
|
||||
ref="wiki"
|
||||
v-model="obj.wiki"
|
||||
:readOnly="formState.readOnly"
|
||||
:parentVM="this"
|
||||
@input="fieldValueChanged('wikiContent')"
|
||||
@input="fieldValueChanged('wiki')"
|
||||
></gz-wiki
|
||||
></v-col>
|
||||
</v-row>
|
||||
@@ -322,7 +322,7 @@ export default {
|
||||
endDate: null,
|
||||
notes: null,
|
||||
count: null,
|
||||
wikiContent: null,
|
||||
wiki: null,
|
||||
customFields: "{}",
|
||||
tags: [],
|
||||
userId: null
|
||||
|
||||
Reference in New Issue
Block a user