@@ -, +, @@ --- Koha/Item.pm | 2 +- installer/data/mysql/atomicupdate/bug_28854.pl | 0 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_28854.pl --- a/Koha/Item.pm +++ a/Koha/Item.pm @@ -1564,7 +1564,7 @@ sub add_to_bundle { } catch { - # FIXME: See if we can move the below copy/paste from Koha::Object::store into it's own class and catch at a lower level in the Schema instantiation.. take inspiration fro DBIx::Error + # FIXME: See if we can move the below copy/paste from Koha::Object::store into it's own class and catch at a lower level in the Schema instantiation, take inspiration from DBIx::Error if ( ref($_) eq 'DBIx::Class::Exception' ) { warn $_->{msg}; if ( $_->{msg} =~ /Cannot add or update a child row: a foreign key constraint fails/ ) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1444,7 +1444,7 @@ Note that permanent location is a code, and location may be an authval. [% IF bundlesEnabled %] var bundle_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail','bundle_tables','json') | $raw %]; - var bundle_lost_value = [% Koha.Preference('BundleLostValue') %]; + var bundle_lost_value = [% Koha.Preference('BundleLostValue') | html %]; [% END %] $(document).ready(function() { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -384,8 +384,8 @@ [% IF bundle_items && !missing_items %]
-

Bundle varified

-

The bundle content was varified

+

Bundle verified

+

The bundle content was verified

View contents list

[% END %] @@ -1558,7 +1558,7 @@ }); } else { feedback.fadeOut(100, function(){ - string = _("Varified: ")+last; + string = _("Verified: ")+last; feedback.addClass('alert-success').removeClass('alert-danger').html(string).fadeIn(100); }); } --