From 2e9c62278c4f7228fe1087a566867e097d76a559 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Tue, 16 Mar 2010 16:13:40 +0100 Subject: [PATCH] (bug #4318) remove the confirmation step in validating a form Signed-off-by: Galen Charlton --- admin/currency.pl | 5 +++-- .../prog/en/modules/admin/currency.tmpl | 13 +------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/admin/currency.pl b/admin/currency.pl index 56d5ee51b0..0d96bfebb8 100755 --- a/admin/currency.pl +++ b/admin/currency.pl @@ -96,8 +96,7 @@ if ($op eq 'add_form') { # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB -} elsif ($op eq 'add_validate') { - $template->param(add_validate => 1); +} elsif ($op eq 'save') { my $dbh = C4::Context->dbh; my $check = $dbh->prepare("select count(*) as count from currency where currency = ?"); @@ -131,6 +130,8 @@ if ($op eq 'add_form') { $input->param('active')||0, ); } + +print $input->redirect("/cgi-bin/koha/admin/currency.pl"); # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl index a75b675d0c..e9e1c9dce6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl @@ -1,7 +1,6 @@ Koha › Administration › Currencies & Exchange Rates › <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->New Currency<!-- /TMPL_IF --><!-- /TMPL_IF --> -<!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF --> <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF --> <!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF --> @@ -58,7 +57,6 @@