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

IDEMPIERE-5934 Read only Chosen Multiple Selection List fields can be updated using Assistant (#2147)

This commit is contained in:
Carlos Ruiz 2023-12-21 13:20:04 +01:00 committed by GitHub
parent 3f912767a3
commit ccbcfb1eb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxListEditor.java
View File

@ -286,17 +286,15 @@ public class WChosenboxListEditor extends WEditor implements ContextMenuListener
addChangeLogMenu(popupMenu); addChangeLogMenu(popupMenu);
popupMenu.removeNewUpdateMenu(); popupMenu.removeNewUpdateMenu();
if(gridField.getDisplayType() == DisplayType.ChosenMultipleSelectionList && gridField.isEditable(true)) { Menuitem editor = new Menuitem();
Menuitem editor = new Menuitem(); editor.setAttribute("EVENT", WEditorPopupMenu.ASSISTANT_EVENT);
editor.setAttribute("EVENT", WEditorPopupMenu.ASSISTANT_EVENT); editor.setLabel(Msg.getMsg(Env.getCtx(), "Assistant"));
editor.setLabel(Msg.getMsg(Env.getCtx(), "Assistant")); if (ThemeManager.isUseFontIconForImage())
if (ThemeManager.isUseFontIconForImage()) editor.setIconSclass("z-icon-Wizard");
editor.setIconSclass("z-icon-Wizard"); else
else editor.setImage(ThemeManager.getThemeResource("images/Wizard16.png"));
editor.setImage(ThemeManager.getThemeResource("images/Wizard16.png")); editor.addEventListener(Events.ON_CLICK, popupMenu);
editor.addEventListener(Events.ON_CLICK, popupMenu); popupMenu.appendChild(editor);
popupMenu.appendChild(editor);
}
} }
} }
@ -832,11 +830,12 @@ public class WChosenboxListEditor extends WEditor implements ContextMenuListener
yesButtonLayout = createHlayoutBtn(new Button[] {bUp, bDown}); yesButtonLayout = createHlayoutBtn(new Button[] {bUp, bDown});
Hlayout noButtonLayout = createHlayoutBtn(new Button[] {bRemove, bAdd}); Hlayout noButtonLayout = createHlayoutBtn(new Button[] {bRemove, bAdd});
boolean isEditable = gridField.isEditable(true);
initListboxAndModel(selectedList, selectedModel, mouseListener, crossListMouseListener, isEditable, Msg.getMsg(Env.getCtx(), "SelectedItems"), yesButtonLayout);
initListboxAndModel(selectedList, selectedModel, mouseListener, crossListMouseListener, true, Msg.getMsg(Env.getCtx(), "SelectedItems"), yesButtonLayout); if (gridField.getDisplayType() == DisplayType.ChosenMultipleSelectionList && isEditable) {
initListboxAndModel(availableList, availableModel, mouseListener, crossListMouseListener, isEditable, Msg.getMsg(Env.getCtx(), "Available"), noButtonLayout);
if (gridField.getDisplayType() == DisplayType.ChosenMultipleSelectionList) {
initListboxAndModel(availableList, availableModel, mouseListener, crossListMouseListener, true, Msg.getMsg(Env.getCtx(), "Available"), noButtonLayout);
hlayout = createHlayoutLine(new Component[] {availableList, selectedList}); hlayout = createHlayoutLine(new Component[] {availableList, selectedList});
} else { } else {
hlayout = createHlayoutLine(new Component[] {selectedList}); hlayout = createHlayoutLine(new Component[] {selectedList});
@ -856,6 +855,14 @@ public class WChosenboxListEditor extends WEditor implements ContextMenuListener
south.setSclass("dialog-footer"); south.setSclass("dialog-footer");
mainLayout.appendChild(south); mainLayout.appendChild(south);
south.appendChild(confirmPanel); south.appendChild(confirmPanel);
if (! isEditable) {
bUp.setVisible(false);
bDown.setVisible(false);
bAdd.setVisible(false);
bRemove.setVisible(false);
bRemoveAll.setVisible(false);
}
} }
private void load() { private void load() {
@ -979,9 +986,9 @@ public class WChosenboxListEditor extends WEditor implements ContextMenuListener
ZKUpdateUtil.setHflex(lb, "1"); ZKUpdateUtil.setHflex(lb, "1");
ZKUpdateUtil.setVflex(lb, true); ZKUpdateUtil.setVflex(lb, true);
if (mouseListener != null) if (mouseListener != null && isItemDraggable)
lb.addDoubleClickListener(mouseListener); lb.addDoubleClickListener(mouseListener);
if (crossListMouseListener != null) if (crossListMouseListener != null && isItemDraggable)
lb.addOnDropListener(crossListMouseListener); lb.addOnDropListener(crossListMouseListener);
lb.setItemDraggable(isItemDraggable); lb.setItemDraggable(isItemDraggable);
lb.setItemRenderer(model); lb.setItemRenderer(model);

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
View File

@ -779,8 +779,9 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
bDown = createButton("MoveDown16", actionListenerUpDown); bDown = createButton("MoveDown16", actionListenerUpDown);
Hlayout yesButtonLayout = createHlayoutBtn(new Button[] {bUp, bDown}); Hlayout yesButtonLayout = createHlayoutBtn(new Button[] {bUp, bDown});
boolean isEditable = gridField.isEditable(true);
initListboxAndModel(selectedList, selectedModel, mouseListener, crossListMouseListener, true, Msg.getMsg(Env.getCtx(), "SelectedItems"), yesButtonLayout); initListboxAndModel(selectedList, selectedModel, mouseListener, crossListMouseListener, isEditable, Msg.getMsg(Env.getCtx(), "SelectedItems"), yesButtonLayout);
hlayout = createHlayoutLine(new Component[] {selectedList}); hlayout = createHlayoutLine(new Component[] {selectedList});
center.appendChild(hlayout); center.appendChild(hlayout);
@ -797,6 +798,12 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
south.setSclass("dialog-footer"); south.setSclass("dialog-footer");
mainLayout.appendChild(south); mainLayout.appendChild(south);
south.appendChild(confirmPanel); south.appendChild(confirmPanel);
if (! isEditable) {
bUp.setVisible(false);
bDown.setVisible(false);
bRemoveAll.setVisible(false);
}
} }
private void load() { private void load() {
@ -879,9 +886,9 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
ZKUpdateUtil.setHflex(lb, "1"); ZKUpdateUtil.setHflex(lb, "1");
ZKUpdateUtil.setVflex(lb, true); ZKUpdateUtil.setVflex(lb, true);
if (mouseListener != null) if (mouseListener != null && isItemDraggable)
lb.addDoubleClickListener(mouseListener); lb.addDoubleClickListener(mouseListener);
if (crossListMouseListener != null) if (crossListMouseListener != null && isItemDraggable)
lb.addOnDropListener(crossListMouseListener); lb.addOnDropListener(crossListMouseListener);
lb.setItemDraggable(isItemDraggable); lb.setItemDraggable(isItemDraggable);
lb.setItemRenderer(model); lb.setItemRenderer(model);