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

IDEMPIERE-700 two org with the same name / fix Not unique in the ID space

This commit is contained in:
Carlos Ruiz 2013-03-11 19:43:19 -05:00
parent 9243e6453d
commit d9094bea02
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
{ {
ComboItem ci = new ComboItem(m_clientKNPairs[i].getName(), m_clientKNPairs[i].getID()); ComboItem ci = new ComboItem(m_clientKNPairs[i].getName(), m_clientKNPairs[i].getID());
String id = AdempiereIdGenerator.escapeId(ci.getLabel()); String id = AdempiereIdGenerator.escapeId(ci.getLabel());
if (ci.getFellowIfAny(id) == null) if (lstClient.getFellowIfAny(id) == null)
ci.setId(id); ci.setId(id);
lstClient.appendChild(ci); lstClient.appendChild(ci);
if (m_clientKNPairs[i].getID().equals(initDefault)) if (m_clientKNPairs[i].getID().equals(initDefault))
@ -369,9 +369,8 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
{ {
ComboItem ci = new ComboItem(roleKNPairs[i].getName(), roleKNPairs[i].getID()); ComboItem ci = new ComboItem(roleKNPairs[i].getName(), roleKNPairs[i].getID());
String id = AdempiereIdGenerator.escapeId(ci.getLabel()); String id = AdempiereIdGenerator.escapeId(ci.getLabel());
if (lstRole.getFellowIfAny(id) == null) { if (lstRole.getFellowIfAny(id) == null)
ci.setId(id); ci.setId(id);
}
lstRole.appendChild(ci); lstRole.appendChild(ci);
if (roleKNPairs[i].getID().equals(initDefault)) if (roleKNPairs[i].getID().equals(initDefault))
lstRole.setSelectedItem(ci); lstRole.setSelectedItem(ci);
@ -425,8 +424,10 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
{ {
ComboItem ci = new ComboItem(orgKNPairs[i].getName(), orgKNPairs[i].getID()); ComboItem ci = new ComboItem(orgKNPairs[i].getName(), orgKNPairs[i].getID());
String id = AdempiereIdGenerator.escapeId(ci.getLabel()); String id = AdempiereIdGenerator.escapeId(ci.getLabel());
if (ci.getFellowIfAny(id) == null) System.out.println("|"+ci.getId()+"|");
if (lstOrganisation.getFellowIfAny(id) == null)
ci.setId(id); ci.setId(id);
System.out.println("|"+ci.getId()+"|");
lstOrganisation.appendChild(ci); lstOrganisation.appendChild(ci);
if(orgKNPairs[i].getID().equals(initDefault)) if(orgKNPairs[i].getID().equals(initDefault))
lstOrganisation.setSelectedItem(ci); lstOrganisation.setSelectedItem(ci);