From 5acde24bfa2574826059f8cfca833dba9e54ce09 Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Fri, 20 Mar 2015 10:36:55 -0400 Subject: [PATCH] PM-1755 REST endpoint GET /api/1.0/{workspace}/departments --- workflow/engine/classes/model/Department.php | 4 ++++ workflow/engine/src/ProcessMaker/BusinessModel/Department.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php index 1745da1e0..d35138dbe 100755 --- a/workflow/engine/classes/model/Department.php +++ b/workflow/engine/classes/model/Department.php @@ -460,6 +460,10 @@ class Department extends BaseDepartment $node['DEP_MANAGER_LASTNAME'] = ''; } + $criteria = new \Criteria(); + $criteria->add(UsersPeer::DEP_UID, $node['DEP_UID'], \Criteria::EQUAL ); + $node['DEP_MEMBERS'] = UsersPeer::doCount($criteria); + $criteriaCount = new Criteria( 'workflow' ); $criteriaCount->clearSelectColumns(); $criteriaCount->addSelectColumn( 'COUNT(*)' ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Department.php b/workflow/engine/src/ProcessMaker/BusinessModel/Department.php index 85fa99119..0c19e55c7 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Department.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Department.php @@ -342,6 +342,10 @@ class Department $node['DEP_MANAGER_LASTNAME'] = ''; } + $criteria = new \Criteria(); + $criteria->add(UsersPeer::DEP_UID, $dep_uid, \Criteria::EQUAL ); + $node['DEP_MEMBERS'] = UsersPeer::doCount($criteria); + $criteriaCount = new \Criteria( 'workflow' ); $criteriaCount->clearSelectColumns(); $criteriaCount->addSelectColumn( 'COUNT(*)' );