From 683e117187205e6f6928d082a9207997158ab17f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 19 Apr 2020 23:10:09 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                |  8 ++++++++
 ayanova/src/api/gzform.js               |  6 +++---
 ayanova/src/components/wiki-control.vue |  3 +--
 ayanova/src/views/widget.vue            | 10 +++++-----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 60dc2ce1..8e4bd202 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -222,6 +222,10 @@ RESEARCH
 
 ------------------------ /WIKI ---------------------------
 
+todo: wiki in datalist?
+	- will need for reports but can't show in a grid, maybe it's available for something but can't be seen or filtered?
+	- shows in grid as basically a bool like has wiki or not but doesn't show any actual wiki?
+	- this is only to feed report, no other purpose to it.
 
 todo: document that emojis can be used in any text field and key combo on windows is winkey-period
 	-other os's too?
@@ -248,6 +252,10 @@ todo: would like to see who I'm logged in as at all times
 todo: QUOTE icon being used is fa-edit, but, that is much more useful in the UI for edit buttons on things, so change quote icon to something else
 
 todo: ATTACHMENTS
+	- TODO: PLANNING - should attachments be actually attached in the db to their object? like Wiki was changed to do?
+		- is this even possible?
+		- if not, then should it really be treated like a data field like wiki in UI or it's own thing?
+		
 	- server should send the list of attachments on an object with the object as a read only property
 		- This way they can be displayed in the UI without another hit to the server and used for attaching wiki images etc etc
 	- Server needs route to get attached files from direct url without headers being set
diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 72cf4d7e..123e3d2b 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -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;
       }
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index c238ff6f..4ed51f1f 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -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?
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index eee9f917..3af3fc51 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -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