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

Merged in release/3.2.2 (pull request #6128)

Browse Source 
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-10-20 12:47:58 +00:00
parent 2032b5076a 4eb81fd01e
commit dd317925c5
24 changed files with 719 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/controllers/admin.php
View File

@@ -196,15 +196,20 @@ class Admin extends Controller
$this->render('extJs');
}
function getSystemInfo ()
public function getSystemInfo()
{
$this->setResponseType( 'json' );
$infoList = $this->_getSystemInfo();
$data = array ();
global $RBAC;
$RBAC->requirePermissions('PM_SETUP_ADVANCE');
foreach ($infoList as $row) {
$data[] = array ('label' => $row[0],'value' => $row[1],'section' => $row[2]
);
$this->setResponseType('json');
$data = [];
foreach ($this->_getSystemInfo() as $row) {
$data[] = [
'label' => $row[0],
'value' => $row[1],
'section' => $row[2]
];
}
return $data;
}