fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Daniel Rojas
2014-04-29 08:52:52 -04:00
parent d78ee38df3 e7360a767f
commit bb086cba3b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rbac/engine/classes/model/RbacUsersPeer.php
View File

@@ -33,7 +33,6 @@
// include object class
//include_once 'classes/model/RbacUsers.php';
//die("----LAST --as");
/**
* Skeleton subclass for performing query and update operations on the 'USERS' table.
*

7
workflow/engine/controllers/adminProxy.php
View File

@@ -1269,7 +1269,12 @@ class adminProxy extends HttpProxyController
$data = array('info' => array());
$pmRestClient = OauthClientsPeer::retrieveByPK('x-pm-local-client');
$status = ! empty($pmRestClient);
$row = $pmRestClient->toArray(BasePeer::TYPE_FIELDNAME);
if ($status) {
$row = $pmRestClient->toArray(BasePeer::TYPE_FIELDNAME);
} else {
$row = array("CLIENT_ID" => '');
}
$data['info'] = array(
array(