fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1820 from julceslauhub/master

Browse Source 
BUG 12170 Error en la creacion de cases notes SOLVED
This commit is contained in:
julceslauhub
2013-06-19 15:42:11 -07:00
parent db01f24a67 74fc1f03ac
commit 7b1eff98c1
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/AppNotes.php
View File

@@ -105,8 +105,8 @@ class AppNotes extends BaseAppNotes
$response['success'] = G::LoadTranslation("ID_FAILURE");
$response['message'] = $msg;
} else {
$response['success'] = "success";
$response['message'] = G::LoadTranslation("ID_SAVED");
$response['success'] = 'success';
$response['message'] = '';
}
if ($notify) {

11
workflow/engine/controllers/appProxy.php
View File

@@ -124,7 +124,16 @@ class AppProxy extends HttpProxyController
//Add note case
$appNote = new AppNotes();
$response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail));
try {
$response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail));
} catch (Exception $error) {
$response = new stdclass();
$response->success = 'success';
$response->message = G::LoadTranslation('ID_ERROR_SEND_NOTIFICATIONS');
$response->message .= '<br /><br />' . $error->getMessage() . '<br /><br />';
$response->message .= G::LoadTranslation('ID_CONTACT_ADMIN');
die(G::json_encode($response));
}
//Send the response to client
@ini_set("implicit_flush", 1);

17
workflow/engine/templates/app/main.js
View File

@@ -363,8 +363,21 @@ function sendNote()
Ext.getCmp('caseNoteText').setDisabled(false);
Ext.getCmp('sendBtn').setDisabled(false);
Ext.getCmp('addCancelBtn').setDisabled(false);
statusBarMessage( _('ID_CASES_NOTE_POST_SUCCESS'), false,true);
storeNotes.load();
if (data.message != '') {
Ext.Msg.show({
title : _('ID_CASES_NOTE_POST_ERROR'),
msg : data.message,
icon : Ext.MessageBox.WARNING,
buttons : Ext.Msg.OK,
fn : function(btn) {
statusBarMessage( _('ID_CASES_NOTE_POST_SUCCESS'), false,true);
storeNotes.load();
}
});
} else {
statusBarMessage( _('ID_CASES_NOTE_POST_SUCCESS'), false,true);
storeNotes.load();
}
} else if (data.lostSession) {
Ext.Msg.show({
title : _('ID_CASES_NOTE_POST_ERROR'),