diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index a83bcfcb3..c01763047 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -75,6 +75,10 @@ class AppProxy extends HttpProxyController $appNotes = new AppNotes(); $response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit ); + require_once ("classes/model/Content.php"); + $content = new Content(); + $response['array']['appTitle'] = $content->load('APP_TITLE', '', $appUid, SYS_LANG); + return $response['array']; } diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 7ecc139c4..b549f0245 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -29,7 +29,6 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid) proUid = !proUid ? "": proUid; taskUid = !taskUid ? "": taskUid; - title = appTitle; var startRecord=0; var loadSize=10; @@ -57,16 +56,18 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid) return false; } - caseNotesWindow.show(); - newNoteAreaActive = false; - newNoteHandler(); caseNotesWindow.setTitle(_('ID_CASES_NOTES') + ' (' + storeNotes.data.items.length + ')'); + title = !appTitle ? storeNotes.reader.jsonData.appTitle : appTitle ; if(storeNotes.getCount()