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

BUG 000 First commit with changes in dashlets for assign to all users

Browse Source
This commit is contained in:
Julio Cesar Laura
2011-11-30 17:00:37 -04:00
parent 30d0a05061
commit 40960d9bc6
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,9 @@ class PMDashlet extends DashletInstance implements DashletInterface {
while ($row = $dataset->getRow()) {
$row['DAS_INS_STATUS_LABEL'] = ($row['DAS_INS_STATUS'] == '1' ? G::LoadTranslation('ID_ACTIVE') : G::LoadTranslation('ID_INACTIVE'));
switch ($row['DAS_INS_OWNER_TYPE']) {
case 'EVERYBODY':
$row['DAS_INS_OWNER_TITLE'] = G::LoadTranslation('ID_ALL_USERS');
break;
case 'USER':
require_once 'classes/model/Users.php';
$userInstance = new Users();
@@ -159,10 +162,24 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$dashletsInstances = array();
// Include required classes
require_once 'classes/model/Department.php';
// Check for "public" dashlets
// ToDo: Next release
// Check for the direct assignments
require_once 'classes/model/Users.php';
// Check for "public" dashlets
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
$criteria->addSelectColumn(DashletPeer::DAS_TITLE);
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_CONTEXT_TIME);
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'EVERYBODY');
$dataset = DashletInstancePeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
while ($row = $dataset->getRow()) {
if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
$row['DAS_TITLE'] .= ' (' . $row['DAS_INS_CONTEXT_TIME'] . ')';
$dashletsInstances[$row['DAS_INS_UID']] = $row;
}
$dataset->next();
}
// Check for the direct assignments
$usersInstance = new Users();
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);

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

@@ -166,6 +166,10 @@ class Dashboard extends Controller {
$result->status = 'OK';
try {
switch ($data->type) {
case 'EVERYBODY':
$result->total = 0;
$result->owners = array();
break;
case 'USER':
require_once 'classes/model/Users.php';