midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-419 New icon shouldn't be displayed for special forms

This commit is contained in:
Carlos Ruiz 2012-09-17 10:16:26 -05:00
parent f78d6dbcf2
commit d561f2b556
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
View File

@ -127,8 +127,8 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
while (en.hasMoreElements()) while (en.hasMoreElements())
{ {
MTreeNode nd = (MTreeNode)en.nextElement(); MTreeNode nd = (MTreeNode)en.nextElement();
if (nd.isOnBar()) { if (nd.isOnBar()) {
addNode(nd.getNode_ID(), nd.toString().trim(), nd.getDescription(), getIconFile(nd), nd.isWindow()); addNode(nd.getNode_ID(), nd.toString().trim(), nd.getDescription(), getIconFile(nd), (nd.isWindow() && !nd.isForm()));
} }
} }
} }

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java
View File

@ -221,11 +221,16 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
link.setImage("/images/mWorkFlow.png"); link.setImage("/images/mWorkFlow.png");
treeitem.setAttribute("menu.type", "workflow"); treeitem.setAttribute("menu.type", "workflow");
} }
else else if (mChildNode.isForm())
{
link.setImage("/images/mWindow.png");
treeitem.setAttribute("menu.type", "form");
}
else // Window
{ {
link.setImage("/images/mWindow.png"); link.setImage("/images/mWindow.png");
treeitem.setAttribute("menu.type", "window"); treeitem.setAttribute("menu.type", "window");
Toolbarbutton newBtn = new Toolbarbutton(null, "/images/New10.png"); Toolbarbutton newBtn = new Toolbarbutton(null, "/images/New10.png");
newBtn.setStyle("padding-left:3px; margin-bottom:5px"); newBtn.setStyle("padding-left:3px; margin-bottom:5px");
treeCell.appendChild(newBtn); treeCell.appendChild(newBtn);

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java
View File

@ -157,9 +157,12 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
public void run(Treeitem treeItem) { public void run(Treeitem treeItem) {
if (treeItem.getAttribute("menu.type") != null) if (treeItem.getAttribute("menu.type") != null)
{ {
String menuType = (String) treeItem.getAttribute("menu.type");
if (menuType.equals("form"))
menuType = "window"; // treat forms as windows on filtering the menu
if (chk.isChecked()) if (chk.isChecked())
{ {
if (chk.getId().equals(treeItem.getAttribute("menu.type"))) if (chk.getId().equals(menuType))
{ {
boolean open = false; boolean open = false;
Treeitem parent = treeItem.getParentItem(); Treeitem parent = treeItem.getParentItem();
@ -172,7 +175,7 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
} }
else else
{ {
if (chk.getId().equals(treeItem.getAttribute("menu.type"))) if (chk.getId().equals(menuType))
{ {
boolean open = false; boolean open = false;
Treeitem parent = treeItem.getParentItem(); Treeitem parent = treeItem.getParentItem();