# HG changeset patch # User Asier Lostalé # Date 1474468753 -7200 # Wed Sep 21 16:39:13 2016 +0200 # Node ID b76057da234f155d92c5e392a33d9cf471bfc364 # Parent 38d87f5ca8e1016f21cda73371157e8f5ba39d7c fixed bug 34201: can't create import entries while changing role org access Removed deprecated client and org list in ad_role because the trigger that kept them in sync was craeting contention for insertions into import entry. diff -r 38d87f5ca8e1 -r b76057da234f src-db/database/model/tables/AD_ROLE.xml --- a/src-db/database/model/tables/AD_ROLE.xml Thu Sep 22 10:40:12 2016 +0200 +++ b/src-db/database/model/tables/AD_ROLE.xml Wed Sep 21 16:39:13 2016 +0200 @@ -45,14 +45,6 @@ - - - - - - - - diff -r 38d87f5ca8e1 -r b76057da234f src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml --- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Thu Sep 22 10:40:12 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ - - - - Cur_Org.AD_Client_ID) THEN - IF (v_ClientList IS NULL OR (LENGTH(v_ClientList) + LENGTH(Cur_Org.AD_Client_ID) + 1 < 2000)) THEN - v_Client_ID:=Cur_Org.AD_Client_ID; - IF(LENGTH(v_ClientList) <> 0) THEN - v_ClientList:=v_ClientList || ','; - END IF; - v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID; - END IF; - END IF; - -- Org - IF (v_OrgList IS NULL OR (LENGTH(v_OrgList) + LENGTH(Cur_Org.AD_Org_ID) + 1 < 2000)) THEN - IF(LENGTH(v_OrgList) <> 0) THEN - v_OrgList:=v_OrgList || ','; - END IF; - v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID; - END IF; - END LOOP; - -- Org - -- - IF(v_ClientList IS NULL OR LENGTH(v_ClientList)=0) THEN - v_ClientList:=CUR_Role.AD_Client_ID; - END IF; - IF(v_OrgList IS NULL OR LENGTH(v_OrgList)=0) THEN - v_OrgList:=CUR_Role.AD_Org_ID; - END IF; - DBMS_OUTPUT.PUT_LINE(CUR_Role.Name || ': Client=' || CUR_Role.ClientList || '->' || v_ClientList || ' - Org= ' || CUR_Role.OrgList || '->' || v_OrgList) ; - -- Update Role - UPDATE AD_Role - SET ClientList=v_ClientList, - OrgList=v_OrgList - WHERE AD_ROLE.AD_ROLE_ID=CUR_Role.AD_ROLE_ID; - END LOOP; - -- Role -END AD_ROLE_ORGACCESS_TRG -]]> - - diff -r 38d87f5ca8e1 -r b76057da234f src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Sep 22 10:40:12 2016 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Sep 21 16:39:13 2016 +0200 @@ -7502,82 +7502,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 38d87f5ca8e1 -r b76057da234f src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Thu Sep 22 10:40:12 2016 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Sep 21 16:39:13 2016 +0200 @@ -1328,20 +1328,6 @@ - - - - - - - - - - - - - - diff -r 38d87f5ca8e1 -r b76057da234f src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Thu Sep 22 10:40:12 2016 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Sep 21 16:39:13 2016 +0200 @@ -5702,60 +5702,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80895,34 +80841,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -81009,34 +80927,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 38d87f5ca8e1 -r b76057da234f src-test/src/org/openbravo/test/dal/IssuesTest.java --- a/src-test/src/org/openbravo/test/dal/IssuesTest.java Thu Sep 22 10:40:12 2016 +0200 +++ b/src-test/src/org/openbravo/test/dal/IssuesTest.java Wed Sep 21 16:39:13 2016 +0200 @@ -229,8 +229,6 @@ r.setClient(c); r.setName("System Administrator"); // Fails unique name constraint r.setUserLevel("S"); - r.setClientList("0"); - r.setOrganizationList("0"); OBDal.getInstance().save(r); OBDal.getInstance().commitAndClose(); } catch (Exception e) { diff -r 38d87f5ca8e1 -r b76057da234f src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java --- a/src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java Thu Sep 22 10:40:12 2016 +0200 +++ b/src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java Wed Sep 21 16:39:13 2016 +0200 @@ -408,8 +408,6 @@ noAccessRole.setName("Test No Access"); noAccessRole.setManual(true); noAccessRole.setUserLevel(" CO"); - noAccessRole.setClientList(OBContext.getOBContext().getCurrentClient().getId()); - noAccessRole.setOrganizationList(ASTERISK_ORG_ID); OBDal.getInstance().save(noAccessRole); RoleOrganization noAcessRoleOrg = OBProvider.getInstance().get(RoleOrganization.class); diff -r 38d87f5ca8e1 -r b76057da234f src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java --- a/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java Thu Sep 22 10:40:12 2016 +0200 +++ b/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java Wed Sep 21 16:39:13 2016 +0200 @@ -93,9 +93,7 @@ Client client = OBDal.getInstance().get(Client.class, clientId); Organization org = OBDal.getInstance().get(Organization.class, organizationId); role.setClient(client); - role.setClientList(clientId); role.setOrganization(org); - role.setOrganizationList(organizationId); role.setTemplate(isTemplate); role.setManual(isManual); role.setName(name); diff -r 38d87f5ca8e1 -r b76057da234f src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java --- a/src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java Thu Sep 22 10:40:12 2016 +0200 +++ b/src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java Wed Sep 21 16:39:13 2016 +0200 @@ -504,8 +504,6 @@ spainRole.setName("QA Only Spain - " + System.currentTimeMillis()); // some randomness spainRole.setOrganization(OBDal.getInstance().getProxy(Organization.class, "0")); spainRole.setManual(true); - spainRole.setClientList("-"); - spainRole.setOrganizationList("-"); spainRole.setUserLevel(" O"); OBDal.getInstance().save(spainRole); createdObjects.add(spainRole); diff -r 38d87f5ca8e1 -r b76057da234f src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java --- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java Thu Sep 22 10:40:12 2016 +0200 +++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java Wed Sep 21 16:39:13 2016 +0200 @@ -592,8 +592,6 @@ newRole.setOrganization(organization); newRole.setName(name); newRole.setDescription(name); - newRole.setClientList(client.getId()); - newRole.setOrganizationList(organization.getId()); newRole.setUserLevel(strUserLevel); newRole.setClientAdmin(isClientAdmin); OBDal.getInstance().save(newRole);