From 0c0886de1abcdd37dab563db731111fb6d25bff4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 14 Jun 2016 06:26:31 -0400 Subject: [PATCH] Bug 14576 (QA Folllowup) Address issues use mock for tests use a separate variable for yaml fix indentation --- C4/Circulation.pm | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js | 4 ++-- t/db_dependent/Circulation/issue.t | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index fc4a642..d422cd3 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1443,7 +1443,7 @@ sub AddIssue { if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' ) { ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart. - CartToShelf( $item->{'itemnumber'} ); + CartToShelf( $item->{'itemnumber'} ); } $item->{'issues'}++; if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) { @@ -1963,11 +1963,11 @@ sub AddReturn { my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not - my $yaml = C4::Context->preference('UpdateItemLocationOnCheckin'); - if ($yaml) { - $yaml = "$yaml\n\n"; # YAML is strict on ending \n. Surplus does not hurt + my $yaml_loc = C4::Context->preference('UpdateItemLocationOnCheckin'); + if ($yaml_loc) { + $yaml_loc = "$yaml_loc\n\n"; # YAML is strict on ending \n. Surplus does not hurt my $rules; - eval { $rules = YAML::Load($yaml); }; + eval { $rules = YAML::Load($yaml_loc); }; if ($@) { warn "Unable to parse UpdateItemLocationOnCheckin syspref : $@"; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 10e1b09..61de9f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -484,7 +484,7 @@ $(document).ready(function () { from [% IF errmsgloo.ItemLocationUpdated.from %] [% IF errmsgloo.ItemLocationUpdated.from == '' %] - empty + empty [% ELSIF AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.from ) == '' %] [% errmsgloo.ItemLocationUpdated.from %] (No description available) [% ELSE %] @@ -496,7 +496,7 @@ $(document).ready(function () { to [% IF errmsgloo.ItemLocationUpdated.to %] [% IF errmsgloo.ItemLocationUpdated.to == '' %] - empty + empty [% ELSIF AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.to ) == '' %] [% errmsgloo.ItemLocationUpdated.to %] (No description available) [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js index 4db6750..ff74b02 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js @@ -148,8 +148,8 @@ $( document ).ready( function () { var reg_check = /.*:\s.*/; for (var i=0; i < split_text.length; i++){ if ( !split_text[i].match(reg_check) && split_text[i].length ) { - alert_issues+=split_text[i]+"\n"; - issue_count++; + alert_issues+=split_text[i]+"\n"; + issue_count++; } } if (issue_count) alert_text += "\n"+_("The following values are not formatted correctly:")+"\n"+alert_issues; diff --git a/t/db_dependent/Circulation/issue.t b/t/db_dependent/Circulation/issue.t index 2698ae4..13e7e9b 100644 --- a/t/db_dependent/Circulation/issue.t +++ b/t/db_dependent/Circulation/issue.t @@ -400,12 +400,12 @@ my $itemnumber2; $biblionumber ); -C4::Context->set_preference( 'UpdateItemLocationOnCheckin', q{} ); +t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', q{} ); AddReturn( 'barcode_4', $samplebranch1->{branchcode} ); my $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq 'FIC', 'UpdateItemLocationOnCheckin does not modify value when not enabled' ); -C4::Context->set_preference( 'UpdateItemLocationOnCheckin', 'FIC: GEN' ); +t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', 'FIC: GEN' ); AddReturn( 'barcode_4', $samplebranch1->{branchcode} ); $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq 'GEN', q{UpdateItemLocationOnCheckin updates location value from 'FIC' to 'GEN' with setting "FIC: GEN"} ); @@ -414,7 +414,7 @@ AddReturn( 'barcode_4', $samplebranch1->{branchcode} ); $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq 'GEN', q{UpdateItemLocationOnCheckin does not update location value from 'GEN' with setting "FIC: GEN"} ); -C4::Context->set_preference( 'UpdateItemLocationOnCheckin', '_ALL_: CART' ); +t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', '_ALL_: CART' ); AddReturn( 'barcode_4', $samplebranch1->{branchcode} ); $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq 'CART', q{UpdateItemLocationOnCheckin updates location value from 'GEN' with setting "_ALL_: CART"} ); @@ -423,7 +423,7 @@ AddIssue( $borrower_1, 'barcode_4', $daysago10,0, $today, '' ); $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq 'GEN', q{Location updates from 'CART' to permanent location on issue} ); -C4::Context->set_preference( 'UpdateItemLocationOnCheckin', "GEN: _BLANK_\n_BLANK_: PROC\nPROC: _PERM_" ); +t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', "GEN: _BLANK_\n_BLANK_: PROC\nPROC: _PERM_" ); AddReturn( 'barcode_4', $samplebranch1->{branchcode} ); $item2 = GetItem( $itemnumber2 ); ok( $item2->{location} eq '', q{UpdateItemLocationOnCheckin updates location value from 'GEN' to '' with setting "GEN: _BLANK_"} ); -- 2.1.4