From bd9f5ffaa36f9bbd54498bc9ae264fe53b0a86ba Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 16 Jan 2013 13:22:26 +0100 Subject: [PATCH] Small fixes in attachments (check for non existent trasactions, proper page refresh after attachment) --- admin/attachments.php | 7 ++++--- admin/db/transactions_db.inc | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/admin/attachments.php b/admin/attachments.php index b34cbe33..9540327a 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -19,6 +19,7 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/admin/db/attachments_db.inc"); +include_once($path_to_root . "/admin/db/transactions_db.inc"); if (isset($_GET['vw'])) $view_id = $_GET['vw']; @@ -81,8 +82,8 @@ if (isset($_GET['trans_no'])) if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM') { - if (!$_POST['trans_no']) - display_error(_("No transaction has been selected.")); + if (!transaction_exists($_POST['filterType'], $_POST['trans_no'])) + display_error(_("Selected transaction does not exists.")); elseif ($Mode == 'ADD_ITEM' && (!isset($_FILES['filename']) || $_FILES['filename']['size'] == 0)) display_error(_("Select attachment file.")); else { @@ -130,7 +131,7 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM') display_notification(_("Attachment has been updated.")); } } - refresh_pager('trans_table'); + refresh_pager('trans_tbl'); $Ajax->activate('_page_body'); $Mode = 'RESET'; } diff --git a/admin/db/transactions_db.inc b/admin/db/transactions_db.inc index 293e8f4d..8eb12130 100644 --- a/admin/db/transactions_db.inc +++ b/admin/db/transactions_db.inc @@ -60,4 +60,8 @@ function get_sql_for_view_transactions($filtertype, $from, $to, &$trans_ref) return $sql; } +function transaction_exists($trans_type, $trans_no) +{ + return db_num_rows(db_query(get_sql_for_view_transactions($trans_type, $trans_no, $trans_no, $dummy))); +} ?> \ No newline at end of file -- 2.30.2