Skip to content

Commit

Permalink
Add subscreensItem.menuInclude to menu data (#600)
Browse files Browse the repository at this point in the history
* Fixed the problem that moqui cannot be deployed as non-root webapp in Tomcat

* Fixed a runtime error if Currency is BTC

* Fixed a runtime error if Currency is BTC

* Fixed the retries of Elastic Client

* Add subscreensItem.menuInclude to menu data
  • Loading branch information
Wei Zhang authored Jul 26, 2023
1 parent df07e4e commit d93b4ee
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2347,6 +2347,7 @@ class ScreenRenderImpl implements ScreenRender {
boolean active = (nextItem == subscreensItem.name)
Map itemMap = [name:subscreensItem.name, title:ec.resource.expand(subscreensItem.menuTitle, ""),
path:screenPath, pathWithParams:pathWithParams, image:image, imageType:imageType]
if (subscreensItem.menuInclude) itemMap.menuInclude = true
if (active) itemMap.active = true
if (screenUrlInstance.disableLink) itemMap.disableLink = true
subscreensList.add(itemMap)
Expand Down

0 comments on commit d93b4ee

Please sign in to comment.