From e332e5c59aea731b68101e85e4dc6348a96ef1d6 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Wed, 8 Feb 2017 18:54:29 -0400 Subject: [PATCH 1/2] HOR-2646 Can not assign Supervisors, endpoint error --- .../BusinessModel/ProcessSupervisor.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php index 21807d68b..aa0ca4815 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php @@ -129,14 +129,14 @@ class ProcessSupervisor $sql = " SELECT DISTINCT " . \GroupUserPeer::GRP_UID . " FROM " . \GroupUserPeer::TABLE_NAME . ", " . \UsersPeer::TABLE_NAME . ", - " . \UsersRolesPeer::TABLE_NAME . ", " . \RolesPermissionsPeer::TABLE_NAME . ", " . \PermissionsPeer::TABLE_NAME . " + " . DB_RBAC_NAME . '.' . \UsersRolesPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.' . \PermissionsPeer::TABLE_NAME . " WHERE " . \GroupUserPeer::GRP_UID . " = " . \GroupwfPeer::GRP_UID . " AND " . \GroupUserPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND " . \UsersPeer::USR_STATUS . " = " . $delimiter . "ACTIVE" . $delimiter . " AND - " . \UsersPeer::USR_UID . " = " . \UsersRolesPeer::USR_UID . " AND - " . \UsersRolesPeer::ROL_UID . " = " . \RolesPermissionsPeer::ROL_UID . " AND - " . \RolesPermissionsPeer::PER_UID . " = " . \PermissionsPeer::PER_UID . " AND - " . \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND - " . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " + " . \UsersPeer::USR_UID . " = " . DB_RBAC_NAME . '.' . \UsersRolesPeer::USR_UID . " AND + " . DB_RBAC_NAME . '.'. \UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::ROL_UID . " AND + " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_UID . " AND + " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND + " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " "; $criteriaGroup->add( @@ -209,13 +209,13 @@ class ProcessSupervisor break; case "AVAILABLE": $sql = " - SELECT DISTINCT " . \UsersRolesPeer::USR_UID . " - FROM " . \UsersRolesPeer::TABLE_NAME . ", " . \RolesPermissionsPeer::TABLE_NAME . ", " . \PermissionsPeer::TABLE_NAME . " - WHERE " . \UsersRolesPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND - " . \UsersRolesPeer::ROL_UID . " = " . \RolesPermissionsPeer::ROL_UID . " AND - " . \RolesPermissionsPeer::PER_UID . " = " . \PermissionsPeer::PER_UID . " AND - " . \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND - " . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " + SELECT DISTINCT " . DB_RBAC_NAME . '.'. \UsersRolesPeer::USR_UID . " + FROM " . DB_RBAC_NAME . '.'.\UsersRolesPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.'. \PermissionsPeer::TABLE_NAME . " + WHERE " . DB_RBAC_NAME . '.'.\UsersRolesPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND + " . DB_RBAC_NAME . '.'.\UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::ROL_UID . " AND + " . DB_RBAC_NAME . '.'.\RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_UID . " AND + " . DB_RBAC_NAME . '.'.\PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND + " . DB_RBAC_NAME . '.'.\PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " "; $criteriaUser->add( From fd24a1e142c5e1eeff1ac1c5c0ceb832ed963b8a Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Fri, 10 Feb 2017 10:56:00 -0400 Subject: [PATCH 2/2] HOR-2667 CLONE 3.2 - Can not assign Supervisors, endpoint error --- .../BusinessModel/ProcessSupervisor.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php index aa0ca4815..2ed4d6d34 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php @@ -133,10 +133,10 @@ class ProcessSupervisor WHERE " . \GroupUserPeer::GRP_UID . " = " . \GroupwfPeer::GRP_UID . " AND " . \GroupUserPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND " . \UsersPeer::USR_STATUS . " = " . $delimiter . "ACTIVE" . $delimiter . " AND " . \UsersPeer::USR_UID . " = " . DB_RBAC_NAME . '.' . \UsersRolesPeer::USR_UID . " AND - " . DB_RBAC_NAME . '.'. \UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::ROL_UID . " AND - " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_UID . " AND - " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND - " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " + " . DB_RBAC_NAME . '.' . \UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::ROL_UID . " AND + " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_UID . " AND + " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND + " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " "; $criteriaGroup->add( @@ -209,13 +209,13 @@ class ProcessSupervisor break; case "AVAILABLE": $sql = " - SELECT DISTINCT " . DB_RBAC_NAME . '.'. \UsersRolesPeer::USR_UID . " - FROM " . DB_RBAC_NAME . '.'.\UsersRolesPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.'. \PermissionsPeer::TABLE_NAME . " - WHERE " . DB_RBAC_NAME . '.'.\UsersRolesPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND - " . DB_RBAC_NAME . '.'.\UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.'. \RolesPermissionsPeer::ROL_UID . " AND - " . DB_RBAC_NAME . '.'.\RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.'. \PermissionsPeer::PER_UID . " AND - " . DB_RBAC_NAME . '.'.\PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND - " . DB_RBAC_NAME . '.'.\PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " + SELECT DISTINCT " . DB_RBAC_NAME . '.' . \UsersRolesPeer::USR_UID . " + FROM " . DB_RBAC_NAME . '.' . \UsersRolesPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::TABLE_NAME . ", " . DB_RBAC_NAME . '.' . \PermissionsPeer::TABLE_NAME . " + WHERE " . DB_RBAC_NAME . '.' . \UsersRolesPeer::USR_UID . " = " . \UsersPeer::USR_UID . " AND + " . DB_RBAC_NAME . '.' . \UsersRolesPeer::ROL_UID . " = " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::ROL_UID . " AND + " . DB_RBAC_NAME . '.' . \RolesPermissionsPeer::PER_UID . " = " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_UID . " AND + " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_CODE . " = " . $delimiter . "PM_SUPERVISOR" . $delimiter . " AND + " . DB_RBAC_NAME . '.' . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " "; $criteriaUser->add(