fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1031 from brayanpereyra/BUG-10084

Browse Source 
Bug I added a functionality to save order the dashlet 10084
This commit is contained in:
julceslauhub
2012-11-30 10:56:10 -08:00
parent f01cc83fcd 43c573430f
commit 087eef6dff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,13 +105,14 @@ class Dashboard extends Controller
{ {
$this->setResponseType( 'json' ); $this->setResponseType( 'json' );
try { try {
$orderDashlet[0] = Bootstrap::json_encode($data->positionCol0); $orderDashlet[0] = Bootstrap::json_decode($data->positionCol0);
$orderDashlet[1] = Bootstrap::json_encode($data->positionCol1); $orderDashlet[1] = Bootstrap::json_decode($data->positionCol1);
$orderDashlet[2] = Bootstrap::json_encode($data->positionCol2); $orderDashlet[2] = Bootstrap::json_decode($data->positionCol2);
G::loadClass('configuration'); G::loadClass('configuration');
$oConfiguration = new Configurations(); $oConfiguration = new Configurations();
$aConfiguration = $oConfiguration->load('Dashboard', '', '', $_SESSION['USER_LOGGED']); $aConfiguration = $oConfiguration->load('Dashboard', '', '', $_SESSION['USER_LOGGED']);
$dataDashboard = array(); $dataDashboard = array();
if (isset($aConfiguration["CFG_VALUE"])) { if (isset($aConfiguration["CFG_VALUE"])) {
$dataDashboard = $aConfiguration["CFG_VALUE"]; $dataDashboard = $aConfiguration["CFG_VALUE"];
@@ -119,7 +120,7 @@ class Dashboard extends Controller
$dataNow['ORDER'] = $orderDashlet; $dataNow['ORDER'] = $orderDashlet;
if (isset($data->columns)) { if (isset($data->columns)) {
$dataNow['COLUMNS'] = Bootstrap::json_encode($data->columns); $dataNow['COLUMNS'] = Bootstrap::json_decode($data->columns);
} }
$dataDashboard = array_merge($dataDashboard, $dataNow); $dataDashboard = array_merge($dataDashboard, $dataNow);