From ce7789f949dc4a24f2bd4cac615ceeec5318c253 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 30 Dec 2019 21:01:31 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 8 ------- ayanova/src/api/gzmenu.js | 22 ++++++++++++++++--- ayanova/src/views/home-search.vue | 13 ++++++++++- .../src/views/test-inventory-widget-edit.vue | 1 + 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index b3ff9481..d10ebd15 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -49,14 +49,6 @@ SHELL / NAV / MENUS / LAYOUT TODO: STUB OUT MENU ITEMS MISSING - - PUT SEARCH into main menu, it's constantly there like help with the source as part of the data sent with the click - - I.E. source could be widget from list or widget entry form and so user is searching widgets or source could be a main page where there is no source so it's empty and search everything - - User clicks on search, it opens a main search form view which is also accessible under HOME section normally so two ways to get there - - PUT SEARCH into HOME section as a main form (make sure it has no search button on *it's* menu) - - Search page allows to select types of objects in an array (maybe, did I code the server that way or single at a time object type) - - Also tags can be selected - - Object type and tag sb clearable with easy single clicks to speed up searching. - - Results are in standard grid list which is sortable or printable or openable to records etc - WIKI - In Widget edit form diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js index 2dde94a2..bd8a61bc 100644 --- a/ayanova/src/api/gzmenu.js +++ b/ayanova/src/api/gzmenu.js @@ -17,10 +17,16 @@ export default { vm.appBar.icon = ctx.icon; vm.appBar.title = ctx.title; - //Parse the forms object type if present + //Parse the formdata if present var formAyaType = 0; - if (ctx.formData && ctx.formData.ayaType != undefined) { - formAyaType = ctx.formData.ayaType; + var formRecordId = 0; + if (ctx.formData) { + if (ctx.formData.ayaType != undefined) { + formAyaType = ctx.formData.ayaType; + } + if (ctx.formData.ayaType != undefined) { + formRecordId = ctx.formData.recordId; + } } //set the help url if presented or default to the User section intro @@ -37,6 +43,16 @@ export default { vm.appBar.menuItems.push({ divider: true, inset: false }); } + //WIKI + if (formRecordId != 0) { + vm.appBar.menuItems.push({ + title: window.$gz.locale.get("WikiPage"), + icon: "feather", + key: "app:wiki", + data: { ayaType: formAyaType, recordId: formRecordId } + }); + } + //GLOBAL BOTTOM PORTION //Global sub-heading diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue index f2cdd331..f6e89f76 100644 --- a/ayanova/src/views/home-search.vue +++ b/ayanova/src/views/home-search.vue @@ -4,7 +4,18 @@