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

Merge pull request #1898 from norahmollo/master

Browse Source 
Translations added - Modified
This commit is contained in:
julceslauhub
2013-07-17 11:18:07 -07:00
parent 4f45379d6d 841d0f15a5
commit 30e1bc393a
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ class Dashboard extends Controller
}
public function renderDashletInstance ($data)
{
{
try {
if (! isset( $data->DAS_INS_UID )) {
$data->DAS_INS_UID = '';
@@ -163,6 +163,7 @@ class Dashboard extends Controller
$width = $_REQUEST['w'];
}
$this->pmDashlet->render( $width );
//G::pr($this->pmDashlet->setup( $width ));die;
} catch (Exception $error) {
//ToDo: Show the error message
echo $error->getMessage();
@@ -203,7 +204,7 @@ class Dashboard extends Controller
}
public function getDashletsInstances ($data)
{
{
$this->setResponseType( 'json' );
$result = new stdclass();
$result->status = 'OK';
@@ -226,7 +227,7 @@ class Dashboard extends Controller
public function dashletInstanceForm ($data)
{
try {
$this->includeExtJS( 'dashboard/dashletInstanceForm', false );
$this->includeExtJS( 'dashboard/dashletInstanceForm', true, true );
$this->setView( 'dashboard/dashletInstanceForm' );
if (! isset( $data->DAS_INS_UID )) {
$data->DAS_INS_UID = '';
@@ -434,8 +435,14 @@ class Dashboard extends Controller
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$dataset->next();
while ($row = $dataset->getRow()) {
if (strstr($row['DAS_TITLE'], '*')) {
$row['DAS_TITLE'] = str_replace('*', '', $row['DAS_TITLE']);
$row['DAS_TITLE'] = G::LoadTranslationPlugin('advancedDashboards', $row['DAS_TITLE']);
}
if ($this->pmDashlet->verifyPluginDashlet($row['DAS_CLASS'])) {
$dashlets[] = array ($row['DAS_UID'],$row['DAS_TITLE']);
}
$dataset->next();
}