diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php index 0ff100f43..853b053b0 100644 --- a/workflow/engine/classes/class.pmDashlet.php +++ b/workflow/engine/classes/class.pmDashlet.php @@ -210,10 +210,9 @@ class PMDashlet extends DashletInstance implements DashletInterface $criteria = new Criteria( 'workflow' ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); - $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE ); - $criteria->addSelectColumn( DashletPeer::DAS_STATUS ); + $criteria->add( DashletInstancePeer::DAS_INS_STATUS, '1' ); $criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'EVERYBODY' ); $dataset = DashletInstancePeer::doSelectRS( $criteria ); @@ -238,11 +237,10 @@ class PMDashlet extends DashletInstance implements DashletInterface $criteria = new Criteria( 'workflow' ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); - $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE ); - $criteria->addSelectColumn( DashletPeer::DAS_STATUS ); $criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); + $criteria->add( DashletInstancePeer::DAS_INS_STATUS, '1' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'USER' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $userUid ); $dataset = DashletInstancePeer::doSelectRS( $criteria ); @@ -269,11 +267,10 @@ class PMDashlet extends DashletInstance implements DashletInterface $criteria = new Criteria( 'workflow' ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); - $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE ); - $criteria->addSelectColumn( DashletPeer::DAS_STATUS ); $criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); + $criteria->add( DashletInstancePeer::DAS_INS_STATUS, '1' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $depUid ); $dataset = DashletInstancePeer::doSelectRS( $criteria ); @@ -302,11 +299,10 @@ class PMDashlet extends DashletInstance implements DashletInterface $criteria = new Criteria( 'workflow' ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); - $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE ); - $criteria->addSelectColumn( DashletPeer::DAS_STATUS ); $criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); + $criteria->add( DashletInstancePeer::DAS_INS_STATUS, '1' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'GROUP' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $grpUid ); $dataset = DashletInstancePeer::doSelectRS( $criteria ); diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index 4cf1a5077..ddafc144e 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -176,16 +176,7 @@ class Dashboard extends Controller if (! isset( $_SESSION['USER_LOGGED'] )) { throw new Exception( G::LoadTranslation('ID_SESSION_EXPIRED') ); } - $dash= $this->pmDashlet->getDashletsInstancesForUser( $_SESSION['USER_LOGGED']); - $dashStatusActive = ""; - $j=0; - foreach ($dash as $dashStatus) { - if ($dashStatus['DAS_INS_STATUS'] != 0){ - $dashStatusActive[$j] = $dashStatus; - $j++; - } - } - return $dashStatusActive; + return $this->pmDashlet->getDashletsInstancesForUser( $_SESSION['USER_LOGGED']); } catch (Exception $error) { throw $error; }