fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG-14034 Status in Dashboards -NEW FEATURE

Browse Source 
In ADMIN > Settings > Dashboard now is available the button Status, this button let Activate or Deactivate the Dashlet, showing the changed status in the Status Field in the grid.

When a dashlet is Inactive this dashlet is not showed in the DASHBOARDS tab. A validation was added to only let the current user see the active dashlets assigned to himself.
This commit is contained in:
jennylee
2014-05-20 10:59:27 -04:00
parent 14d7704e6f
commit a1f76e8df9
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.pmDashlet.php
View File

@@ -210,10 +210,9 @@ class PMDashlet extends DashletInstance implements DashletInterface
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS );
$criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS );
$criteria->addSelectColumn( DashletPeer::DAS_TITLE ); $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->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN );
$criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'EVERYBODY' ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE, 'EVERYBODY' );
$dataset = DashletInstancePeer::doSelectRS( $criteria ); $dataset = DashletInstancePeer::doSelectRS( $criteria );
@@ -238,11 +237,10 @@ class PMDashlet extends DashletInstance implements DashletInterface
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS );
$criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS );
$criteria->addSelectColumn( DashletPeer::DAS_TITLE ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE );
$criteria->addSelectColumn( DashletPeer::DAS_STATUS );
$criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); $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_TYPE, 'USER' );
$criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $userUid ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $userUid );
$dataset = DashletInstancePeer::doSelectRS( $criteria ); $dataset = DashletInstancePeer::doSelectRS( $criteria );
@@ -269,11 +267,10 @@ class PMDashlet extends DashletInstance implements DashletInterface
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS );
$criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS );
$criteria->addSelectColumn( DashletPeer::DAS_TITLE ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE );
$criteria->addSelectColumn( DashletPeer::DAS_STATUS );
$criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); $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_TYPE, 'DEPARTMENT' );
$criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $depUid ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $depUid );
$dataset = DashletInstancePeer::doSelectRS( $criteria ); $dataset = DashletInstancePeer::doSelectRS( $criteria );
@@ -302,11 +299,10 @@ class PMDashlet extends DashletInstance implements DashletInterface
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_UID );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES ); $criteria->addSelectColumn( DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES );
$criteria->addSelectColumn( DashletInstancePeer::DAS_INS_STATUS );
$criteria->addSelectColumn( DashletPeer::DAS_CLASS ); $criteria->addSelectColumn( DashletPeer::DAS_CLASS );
$criteria->addSelectColumn( DashletPeer::DAS_TITLE ); $criteria->addSelectColumn( DashletPeer::DAS_TITLE );
$criteria->addSelectColumn( DashletPeer::DAS_STATUS );
$criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN ); $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_TYPE, 'GROUP' );
$criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $grpUid ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $grpUid );
$dataset = DashletInstancePeer::doSelectRS( $criteria ); $dataset = DashletInstancePeer::doSelectRS( $criteria );

11
workflow/engine/controllers/dashboard.php
View File

@@ -176,16 +176,7 @@ class Dashboard extends Controller
if (! isset( $_SESSION['USER_LOGGED'] )) { if (! isset( $_SESSION['USER_LOGGED'] )) {
throw new Exception( G::LoadTranslation('ID_SESSION_EXPIRED') ); throw new Exception( G::LoadTranslation('ID_SESSION_EXPIRED') );
} }
$dash= $this->pmDashlet->getDashletsInstancesForUser( $_SESSION['USER_LOGGED']); return $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;
} catch (Exception $error) { } catch (Exception $error) {
throw $error; throw $error;
} }