From 12797b6c92bad0491a94d88cafd6086cff7a653b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 12 Sep 2013 11:44:25 +0200 Subject: [PATCH] Bug 7180: QA followup - fix unit tests (use a transaction). - add 3 tabs on the page in order to be more understandable. - fix a warn in logs --- acqui/addorderiso2709.pl | 1 + .../prog/en/modules/acqui/addorderiso2709.tt | 42 ++++++++++++-------- t/db_dependent/Budgets.t | 9 +++++ 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 78e8fd5..6cd61b9 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -502,6 +502,7 @@ sub get_infos_syspref { } my $r; for my $field_name ( @$field_list ) { + next unless exists $yaml->{$field_name}; my @fields = split /\|/, $yaml->{$field_name}; for my $field ( @fields ) { my ( $f, $sf ) = split /\$/, $field; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 6fa5e53..bca7e9c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -72,11 +72,11 @@ if ( $(this).is(':checked') ) { $(container).addClass("selected"); $(container).removeClass("unselected"); - $(container).find("ol").toggle(); + $(container).find("ol").toggle(true); } else { $(container).addClass("unselected"); $(container).removeClass("selected"); - $(container).find("ol").toggle(); + $(container).find("ol").toggle(false); } } ); @@ -114,12 +114,12 @@ return disableUnchecked($(this)); }); + $('#tabs').tabs(); }); function disableUnchecked(form){ $("div.biblio.unselected").each(function(){ - $(this).find('select').attr('disabled', 'disabled'); - $(this).find('input').attr('disabled', 'disabled'); + $(this).remove(); }); return 1; } @@ -138,11 +138,17 @@

Add orders from [% comments %] ([% file_name %] staged on [% upload_timestamp %])

-
+
+
+ +
Check All Uncheck All - @@ -154,7 +160,7 @@ [% END %] [% FOREACH biblio IN biblio_list %] -
+
[% END %]
-
-

Import All

-

Import all the lines in the basket with the following parameters:

+
+

Items information

+

Import all the checked items in the basket with the following parameters:

[% IF ( items ) %] -
+
Item [% IF ( NoACQframework ) %]
No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
@@ -249,8 +255,9 @@ [% END %]
[% END %] - -
+
+
+
Accounting details
  1. @@ -329,11 +336,12 @@
-
- Cancel -
+
+
-
+
+ Cancel +
[% ELSE %]
diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t index d9bcd51..0e475bc 100755 --- a/t/db_dependent/Budgets.t +++ b/t/db_dependent/Budgets.t @@ -3,9 +3,16 @@ use warnings; use Test::More tests => 20; BEGIN {use_ok('C4::Budgets') } +use C4::Context; use C4::Dates; use YAML; +my $dbh = C4::Context->dbh; +$dbh->{AutoCommit} = 0; +$dbh->{RaiseError} = 1; + +$dbh->do(q|DELETE FROM aqbudgetperiods|); +$dbh->do(q|DELETE FROM aqbudgets|); # # Budget Periods : @@ -110,3 +117,5 @@ is($budget_by_code->{budget_notes}, 'This is a note', "GetBudgetByCode, check no ok($del_status=DelBudget($budget_id), "DelBudget returned $del_status"); + +$dbh->rollback; -- 1.7.10.4