details: https://code.openbravo.com/erp/devel/pi/rev/c263f4e3ec22
changeset: 15135:c263f4e3ec22
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Jan 12 17:36:12 2012 +0100
summary: Fixed issue 19464. Summary menu entries will be hidden correctly.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
| 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (24 lines):
diff -r 405616506141 -r c263f4e3ec22
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Thu Jan 12 16:49:09 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Thu Jan 12 17:36:12 2012 +0100
@@ -360,8 +360,8 @@
if (!addOption) {
Menu menuEntry = OBDal.getInstance().get(Menu.class,
treeNode.getNode());
if (menuEntry != null) {
- addOption = menuEntry.isActive();
- inactiveSummary = menuEntry.isSummaryLevel();
+ addOption = menuEntry.isSummaryLevel();
+ inactiveSummary = true;
}
}
@@ -369,7 +369,8 @@
final MenuOption menuOption = new MenuOption();
menuOption.setTreeNode(treeNode);
menuOption.setDbId(treeNode.getId());
- if (inactiveSummary) {
+ Menu menuEntry = OBDal.getInstance().get(Menu.class,
treeNode.getNode());
+ if (menuEntry != null && !menuEntry.isActive()) {
menuOption.setVisible(false);
}
menuOptions.add(menuOption);
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
