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

IDEMPIERE-4836 Adding Access tab on Document Status (Activity) (#1081) 

* IDEMPIERE-4836 Adding Access tab on Document Status (Activity) / fix unit test

* IDEMPIERE-4836 Adding Access tab on Document Status (Activity) / fix condition for access (must be AND instead of OR for role and user)
This commit is contained in:
Carlos Ruiz 2021-12-23 11:44:01 +01:00 committed by GitHub
parent 1924ddb85d
commit 6fb0f8f359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/model/MDocumentStatus.java
View File

@ -162,9 +162,9 @@ public class MDocumentStatus extends X_PA_DocumentStatus {
/* the only problem here is that is not easy to hide things from System role or System user /* the only problem here is that is not easy to hide things from System role or System user
* but as they are the administrators is not a problem * but as they are the administrators is not a problem
*/ */
if (access.getAD_Role_ID() == roleId) if ( (access.getAD_Role_ID() == roleId && access.getAD_User_ID() == userId)
return true; || (access.getAD_Role_ID() == roleId && access.getAD_User_ID() == 0 )
if (access.getAD_User_ID() == userId) || (access.getAD_Role_ID() == 0 && access.getAD_User_ID() == userId) )
return true; return true;
} }

8
org.idempiere.test/src/org/idempiere/test/base/DocumentStatusTest.java
View File

@ -30,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays; import java.util.Arrays;
import org.compiere.model.MDocumentStatus; import org.compiere.model.MDocumentStatus;
import org.compiere.model.MDocumentStatusAccess;
import org.compiere.model.MEntityType; import org.compiere.model.MEntityType;
import org.compiere.model.MInvoice; import org.compiere.model.MInvoice;
import org.compiere.model.MOrder; import org.compiere.model.MOrder;
import org.compiere.model.X_PA_DocumentStatusAccess;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.idempiere.test.AbstractTestCase; import org.idempiere.test.AbstractTestCase;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -74,7 +74,7 @@ public class DocumentStatusTest extends AbstractTestCase {
invoiceDS.setSeqNo(10); invoiceDS.setSeqNo(10);
invoiceDS.saveEx(); invoiceDS.saveEx();
X_PA_DocumentStatusAccess invoiceDSAccess = new X_PA_DocumentStatusAccess(Env.getCtx(),0, getTrxName()); MDocumentStatusAccess invoiceDSAccess = new MDocumentStatusAccess(Env.getCtx(),0, getTrxName());
invoiceDSAccess.setPA_DocumentStatus_ID(invoiceDS.get_ID()); invoiceDSAccess.setPA_DocumentStatus_ID(invoiceDS.get_ID());
invoiceDSAccess.setAD_User_ID(USER_GARDENADMIN); invoiceDSAccess.setAD_User_ID(USER_GARDENADMIN);
invoiceDSAccess.setAD_Role_ID(ROLE_GARDENWORLDADMIN); invoiceDSAccess.setAD_Role_ID(ROLE_GARDENWORLDADMIN);
@ -99,7 +99,7 @@ public class DocumentStatusTest extends AbstractTestCase {
requestDS.setSeqNo(30); requestDS.setSeqNo(30);
requestDS.saveEx(); requestDS.saveEx();
X_PA_DocumentStatusAccess requestDSAccess = new X_PA_DocumentStatusAccess(Env.getCtx(),0, getTrxName()); MDocumentStatusAccess requestDSAccess = new MDocumentStatusAccess(Env.getCtx(),0, getTrxName());
requestDSAccess.setPA_DocumentStatus_ID(requestDS.get_ID()); requestDSAccess.setPA_DocumentStatus_ID(requestDS.get_ID());
requestDSAccess.setAD_Role_ID( ROLE_GARDENWORLDUSER); requestDSAccess.setAD_Role_ID( ROLE_GARDENWORLDUSER);
requestDSAccess.saveEx(); requestDSAccess.saveEx();
@ -113,7 +113,7 @@ public class DocumentStatusTest extends AbstractTestCase {
WorkflowActivitiesDS.setSeqNo(40); WorkflowActivitiesDS.setSeqNo(40);
WorkflowActivitiesDS.saveEx(); WorkflowActivitiesDS.saveEx();
X_PA_DocumentStatusAccess WorkflowActivitiesDSAccess = new X_PA_DocumentStatusAccess(Env.getCtx(),0, getTrxName()); MDocumentStatusAccess WorkflowActivitiesDSAccess = new MDocumentStatusAccess(Env.getCtx(),0, getTrxName());
WorkflowActivitiesDSAccess.setPA_DocumentStatus_ID(WorkflowActivitiesDS.get_ID()); WorkflowActivitiesDSAccess.setPA_DocumentStatus_ID(WorkflowActivitiesDS.get_ID());
WorkflowActivitiesDSAccess.setAD_User_ID(USER_GARDENADMIN); WorkflowActivitiesDSAccess.setAD_User_ID(USER_GARDENADMIN);
WorkflowActivitiesDSAccess.saveEx(); WorkflowActivitiesDSAccess.saveEx();