Merged in bugfix/PMCORE-3674 (pull request #8394)
PMCORE-3674 Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
@@ -7079,7 +7079,7 @@ class Cases
|
||||
* @return array|stdclass|string
|
||||
*
|
||||
*/
|
||||
public function getCaseNotes($applicationID, $type = 'array', $userUid = '')
|
||||
public static function getCaseNotes($applicationID, $type = 'array', $userUid = '')
|
||||
{
|
||||
require_once("classes/model/AppNotes.php");
|
||||
$appNotes = new AppNotes();
|
||||
@@ -7108,6 +7108,7 @@ class Cases
|
||||
case 'object':
|
||||
$response = new stdclass();
|
||||
foreach ($appNotes['array']['notes'] as $key => $value) {
|
||||
$response->$key = new stdclass();
|
||||
$response->$key->FULL_NAME = $value['USR_FIRSTNAME'] . " " . $value['USR_LASTNAME'];
|
||||
foreach ($value as $keys => $value) {
|
||||
if ($keys != 'USR_FIRSTNAME' && $keys != 'USR_LASTNAME' && $keys != 'USR_EMAIL') {
|
||||
|
||||
@@ -1204,7 +1204,9 @@ class WsBase
|
||||
{
|
||||
try {
|
||||
global $RBAC;
|
||||
|
||||
if (is_null($RBAC)) {
|
||||
$RBAC = RBAC::getSingleton();
|
||||
}
|
||||
$RBAC->initRBAC();
|
||||
|
||||
if (empty($userName)) {
|
||||
@@ -1715,6 +1717,9 @@ class WsBase
|
||||
{
|
||||
try {
|
||||
global $RBAC;
|
||||
if (is_null($RBAC)) {
|
||||
$RBAC = RBAC::getSingleton();
|
||||
}
|
||||
$RBAC->initRBAC();
|
||||
$user = $RBAC->verifyUserId($userId);
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user