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

Improvement in the dashlets instances list, validating when a dashlet class doesn't exists

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-02-18 10:21:05 -04:00
parent 2f81b35e63
commit fdc7e01809
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,11 @@ class PMDashlet extends DashletInstance implements DashletInterface
$row['DAS_INS_TITLE'] = (isset( $arrayField['DAS_INS_TITLE'] ) && ! empty( $arrayField['DAS_INS_TITLE'] )) ? $arrayField['DAS_INS_TITLE'] : '';
if (! class_exists( $row['DAS_CLASS'] )) {
self::setIncludePath();
require_once 'classes' . PATH_SEP . 'class.' . $row['DAS_CLASS'] . '.php';
@include 'classes' . PATH_SEP . 'class.' . $row['DAS_CLASS'] . '.php';
if (! class_exists( $row['DAS_CLASS'] )) {
$dataset->next();
continue;
}
}
eval( "\$row['DAS_VERSION'] = defined('" . $row['DAS_CLASS'] . "::version') ? " . $row['DAS_CLASS'] . "::version : \$row['DAS_VERSION'];" );
@@ -156,18 +160,6 @@ class PMDashlet extends DashletInstance implements DashletInterface
}
}
public function getDashletsInstancesQuantity ()
{
try {
$criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( '*' );
$criteria->addJoin( DashletInstancePeer::DAS_UID, DashletPeer::DAS_UID, Criteria::INNER_JOIN );
return DashletInstancePeer::doCount( $criteria );
} catch (Exception $error) {
throw $error;
}
}
public function loadDashletInstance ($dasInsUid)
{
try {

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

@@ -215,7 +215,7 @@ class Dashboard extends Controller
$data->limit = null;
}
$result->dashletsInstances = $this->pmDashlet->getDashletsInstances( $data->start, $data->limit );
$result->totalDashletsInstances = $this->pmDashlet->getDashletsInstancesQuantity();
$result->totalDashletsInstances = count($result->dashletsInstances);
} catch (Exception $error) {
$result->status = 'ERROR';
$result->message = $error->getMessage();