From f2e4c758b02b25f67074a41880760a862dd14b63 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 2 Jan 2020 22:24:31 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 3 --- ayanova/src/api/gzmenu.js | 15 +++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 9dbb3977..6aa19d2b 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -50,9 +50,6 @@ SHELL / NAV / MENUS / LAYOUT TODO: Search option appears in menu on Search page. :) -TODO: Upgrade front and back end libs / tools / frameworks - - is .net 3.1 released yet? Jesus! :) - - Vue / vuetify etc TODO: Enforce role rights for menu items once it's stubbed out diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js index d33292ee..0d2022d1 100644 --- a/ayanova/src/api/gzmenu.js +++ b/ayanova/src/api/gzmenu.js @@ -107,12 +107,15 @@ export default { vm.appBar.menuItems.push({ divider: true, inset: false }); //SEARCH - vm.appBar.menuItems.push({ - title: window.$gz.locale.get("Search"), - icon: "search", - key: "app:search", - data: formAyaType - }); + if (ctx.icon != "fa-search") { + //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice + vm.appBar.menuItems.push({ + title: window.$gz.locale.get("Search"), + icon: "search", + key: "app:search", + data: formAyaType + }); + } //HELP vm.appBar.menuItems.push({