From 9191eb45354d23ca880efc281fd1c0ba8f248097 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Wed, 11 Feb 2015 08:53:16 +0100 Subject: [PATCH] Show error messages in item form when upload fails Remove check for validation flag in handle_server_validation --- application/controllers/items.php | 4 +++- js/common.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/controllers/items.php b/application/controllers/items.php index 5d2c59dae..8acf33b9b 100644 --- a/application/controllers/items.php +++ b/application/controllers/items.php @@ -427,7 +427,9 @@ class Items extends Secure_area implements iData_controller $error_message = $upload_success ? $this->lang->line('items_error_adding_updating') .' '. $item_data['name'] : $this->upload->display_errors(); - echo json_encode(array('success'=>false,'message'=>$error_message,'item_id'=>$item_id)); + echo json_encode(array('success'=>false, + 'error_messages'=>array($this->upload->display_errors()), + 'message'=>$error_message,'item_id'=>$item_id)); } } diff --git a/js/common.js b/js/common.js index ef267c571..e4b8dfb94 100644 --- a/js/common.js +++ b/js/common.js @@ -50,7 +50,7 @@ $.each(['customers', 'items', 'reports', 'receivings', 'sales', 'employees', 'co function handle_validation(response) { - if (!response.success && !response.validated) + if (!response.success) { var error_message_box = '.error_message_box'; // server side validation failed.. record won't be saved