From 6709f285461228bff4973d5747e3c7a16f3f4a9a Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Wed, 6 May 2015 15:31:54 -0400 Subject: [PATCH 1/2] =?UTF-8?q?PM--2619=20No=20se=20visualiza=20si=20se=20?= =?UTF-8?q?subi=C3=B3=20correctamente=20el=20logo=20requerido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/controllers/adminProxy.php | 9 +++++++-- workflow/engine/templates/admin/pmLogo.js | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 4979ad2c9..9cd1b2ce2 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1009,7 +1009,6 @@ class adminProxy extends HttpProxyController public function uploadImage() { //!dataSystem - G::LoadSystem('inputfilter'); $filter = new InputFilter(); $_SERVER["REQUEST_URI"] = $filter->xssFilterHard($_SERVER["REQUEST_URI"]); @@ -1090,7 +1089,13 @@ class adminProxy extends HttpProxyController $uploaded = $filter->validateInput($uploaded,'int'); $files_img_type = $filter->xssFilterHard($files_img_type); $failed = $filter->validateInput($failed,'int'); - echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $files_img_type . '"}'; + $resp = array( + 'success' => true, + 'failed' => $failed, + 'uploaded' => $uploaded, + 'type' => $files_img_type + ); + echo json_encode($resp); exit(); } diff --git a/workflow/engine/templates/admin/pmLogo.js b/workflow/engine/templates/admin/pmLogo.js index 0da25c7c1..fe349cec2 100644 --- a/workflow/engine/templates/admin/pmLogo.js +++ b/workflow/engine/templates/admin/pmLogo.js @@ -257,7 +257,7 @@ Ext.onReady(function() { waitTitle : " ", success : function(form, o) { obj = Ext.util.JSON.decode(o.response.responseText); - if (obj.failed == '0' && obj.uploaded != '0') { + if ((obj.failed == '' || obj.failed == '0') && obj.uploaded != '0') { PMExt.notify(_('ID_SUCCESS'), _('ID_YOUR_IMAGE_HAS_BEEN_SUCCESSFULLY')); } else { From 16e272007253b154c0fcc1ed4b218aefd5c8988d Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Wed, 6 May 2015 15:48:33 -0400 Subject: [PATCH 2/2] PM--2619 Adicion de funcion G::json_encode --- workflow/engine/controllers/adminProxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 9cd1b2ce2..467cb39d0 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1095,7 +1095,7 @@ class adminProxy extends HttpProxyController 'uploaded' => $uploaded, 'type' => $files_img_type ); - echo json_encode($resp); + echo G::json_encode($resp); exit(); }