details: /erp/devel/pi/rev/726dffeed3b8
changeset: 10585:726dffeed3b8
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 11 17:36:56 2011 +0100
summary: [application-menu] Added icons for menu entries - added 'report'
type to the menu
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
| 8 ++++----
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
| 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 2ba9083bdb8d -r 726dffeed3b8
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
Fri Feb 11 17:27:31 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Fri Feb 11 17:36:56 2011 +0100
@@ -60,7 +60,7 @@
private static final long serialVersionUID = 1L;
public static enum MenuEntryType {
- Window, Process, ProcessManual, Task, Form, External, Summary, View
+ Window, Process, ProcessManual, Report, Task, Form, External, Summary, View
};
private MenuOption cachedMenu;
@@ -272,12 +272,12 @@
if (menuOption != null) {
if (process.getUIPattern().equals("Standard")) {
menuOption.setType(MenuEntryType.Process);
+ } else if (process.isReport() || process.isJasperReport()) {
+ menuOption.setType(MenuEntryType.Report);
+ menuOption.setReport(true);
} else {
menuOption.setType(MenuEntryType.ProcessManual);
}
- if (process.isReport() || process.isJasperReport()) {
- menuOption.setReport(true);
- }
menuOption.setId(mim.getMappingName());
}
}
diff -r 2ba9083bdb8d -r 726dffeed3b8
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
Fri Feb 11 17:27:31 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
Fri Feb 11 17:36:56 2011 +0100
@@ -45,6 +45,10 @@
, type: 'processManual'
, manualUrl: '${menuOption.id?js_string}'
, manualProcessId: '${menuOption.menu.process.id}'
+ <#elseif menuOption.report>
+ , type: 'report'
+ , manualUrl: '${menuOption.id?js_string}'
+ , manualProcessId: '${menuOption.menu.process.id}'
<#elseif menuOption.task>
, type: 'task'
, manualUrl: '${menuOption.id?js_string}'
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
