From 9c6c7f431d1316b65bb996186acedcc3e8c3b582 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 29 Mar 2009 15:18:46 +0000 Subject: [PATCH] Added cancel button on Items page. --- CHANGELOG.txt | 5 +++++ inventory/manage/items.php | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1e5f54fa..eb8a0a4b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,11 @@ Legend: ! -> Note $ -> Affected files + +29-Mar-2009 Janusz Dobrowolski +! Added cancel button +$ /inventory/manage/items.php + 21-Mar-2009 Janusz Dobrowolski + Option to use last document date on subsequent new documents. $ /admin/display_prefs.php diff --git a/inventory/manage/items.php b/inventory/manage/items.php index de0261b7..dbd25cd3 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -22,7 +22,7 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $user_comp = user_company(); -$new_item = get_post('stock_id')==''; +$new_item = get_post('stock_id')=='' || get_post('cancel'); //------------------------------------------------------------------------------------ if (isset($_GET['stock_id'])) @@ -40,6 +40,14 @@ if (list_updated('stock_id')) { $Ajax->activate('details'); $Ajax->activate('controls'); } + +if (get_post('cancel')) { + $_POST['NewStockID'] = $_POST['stock_id'] = ''; + clear_data(); + set_focus('stock_id'); + $Ajax->activate('_page_body'); +} + if (list_updated('category_id') || list_updated('mb_flag')) { $Ajax->activate('details'); } @@ -412,9 +420,11 @@ if (!isset($_POST['NewStockID']) || $new_item) } else { - submit_center_first('addupdate', _("Update Item"), '', 'default'); + submit_center_first('addupdate', _("Update Item"), '', + count($_SESSION['Context']) ? true : 'default'); submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default'); - submit_center_last('delete', _("Delete This Item"), '', true); + submit('delete', _("Delete This Item"), true, '', true); + submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel'); } div_end(); -- 2.30.2