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

IDEMPIERE-2418 Record Access Dialog Layout issue (#383) 

Fix layout for desktop and mobile
Filter the role list to exclude System roles
This commit is contained in:
Carlos Ruiz 2020-11-17 14:36:27 +01:00 committed by GitHub
parent 4125e5a10b
commit ca3da22f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
View File

@ -18,6 +18,7 @@ import java.sql.ResultSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.webui.ClientInfo;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
@ -29,7 +30,6 @@ import org.adempiere.webui.component.Row;
import org.adempiere.webui.component.Rows; import org.adempiere.webui.component.Rows;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.model.MRecordAccess; import org.compiere.model.MRecordAccess;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
@ -39,7 +39,7 @@ import org.compiere.util.Msg;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Div; import org.zkoss.zul.Space;
import org.zkoss.zul.Toolbarbutton; import org.zkoss.zul.Toolbarbutton;
/** /**
@ -66,7 +66,6 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
setTitle(Msg.translate(Env.getCtx(), "RecordAccessDialog")); setTitle(Msg.translate(Env.getCtx(), "RecordAccessDialog"));
setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
setBorder("normal"); setBorder("normal");
ZKUpdateUtil.setWidth(this, "600px");
setSizable(true); setSizable(true);
log.info("AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID); log.info("AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID);
@ -112,9 +111,9 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
{ {
// Load Roles // Load Roles
String sql = MRole.getDefault().addAccessSQL( String sql = MRole.getDefault().addAccessSQL(
"SELECT AD_Role_ID, Name FROM AD_Role ORDER BY 2", "SELECT AD_Role_ID, Name FROM AD_Role WHERE AD_Client_ID=? ORDER BY 2",
"AD_Role", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); "AD_Role", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
roleField = new Listbox(DB.getKeyNamePairs(sql, false)); roleField = new Listbox(DB.getKeyNamePairs(sql, false, Env.getAD_Client_ID(Env.getCtx())));
roleField.setMold("select"); roleField.setMold("select");
// Load Record Access for all roles // Load Record Access for all roles
@ -184,6 +183,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
Grid grid = GridFactory.newGridLayout(); Grid grid = GridFactory.newGridLayout();
this.appendChild(grid); this.appendChild(grid);
grid.setHflex("min");
Rows rows = new Rows(); Rows rows = new Rows();
grid.appendChild(rows); grid.appendChild(rows);
@ -191,39 +191,38 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
Row row = new Row(); Row row = new Row();
rows.appendChild(row); rows.appendChild(row);
row.appendChild(bUp); row.appendChild(bUp);
row.appendChild(new Label()); row.appendChild(new Space());
row.appendChild(new Label()); row.appendCellChild(bDown);
row.appendChild(new Label()); row.getLastCell().setStyle("text-align: right;");
row.appendChild(new Label());
row.appendChild(new Label());
row.appendChild(bNew);
row = new Row(); row = new Row();
rows.appendChild(row); rows.appendChild(row);
row.appendChild(roleLabel); row.appendChild(roleLabel);
row.appendChild(roleField); row.appendCellChild(roleField, 2);
if (ClientInfo.maxWidth(ClientInfo.EXTRA_SMALL_WIDTH-1)) {
roleField.setWidth("220px");
}
row = new Row();
rows.appendChild(row);
row.appendChild(cbActive); row.appendChild(cbActive);
row.appendChild(cbExclude); row.appendChild(cbExclude);
row = new Row();
rows.appendChild(row);
row.appendChild(cbReadOnly); row.appendChild(cbReadOnly);
row.appendChild(cbDependent); row.appendChild(cbDependent);
row = new Row();
rows.appendChild(row);
row.appendChild(bNew);
row.appendChild(bDelete); row.appendChild(bDelete);
row.appendCellChild(rowNoLabel);
row.getLastCell().setStyle("text-align: right;");
row = new Row(); row = new Row();
rows.appendChild(row); rows.appendChild(row);
row.appendChild(bDown); row.appendCellChild(confirmPanel, 3);
row.appendChild(new Label());
row.appendChild(new Label());
row.appendChild(new Label());
row.appendChild(new Label());
row.appendChild(new Label());
row.appendChild(rowNoLabel);
row = new Row();
rows.appendChild(row);
Div div = new Div();
div.setStyle("text-align: right;");
div.appendChild(confirmPanel);
row.appendCellChild(div, 7);
bUp.addEventListener(Events.ON_CLICK, this); bUp.addEventListener(Events.ON_CLICK, this);
bDown.addEventListener(Events.ON_CLICK, this); bDown.addEventListener(Events.ON_CLICK, this);