Attachment #136283 for bug #28854

View | Details | Raw Unified | Return to bug 28854
Collapse All | Expand All

Lines 1564-1570 sub add_to_bundle { Link Here

(-)a/Koha/Item.pm (-1 / +1 lines)
1564	}	1564	}
1565	catch {	1565	catch {
1566		1566
1567	# 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	1567	# 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
1568	if ( ref($_) eq 'DBIx::Class::Exception' ) {	1568	if ( ref($_) eq 'DBIx::Class::Exception' ) {
1569	warn $_->{msg};	1569	warn $_->{msg};
1570	if ( $_->{msg} =~ /Cannot add or update a child row: a foreign key constraint fails/ ) {	1570	if ( $_->{msg} =~ /Cannot add or update a child row: a foreign key constraint fails/ ) {

Lines 1438-1444 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
1438		1438
1439	[% IF bundlesEnabled %]	1439	[% IF bundlesEnabled %]
1440	var bundle_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail','bundle_tables','json') \| $raw %];	1440	var bundle_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail','bundle_tables','json') \| $raw %];
1441	var bundle_lost_value = [% Koha.Preference('BundleLostValue') %];	1441	var bundle_lost_value = [% Koha.Preference('BundleLostValue') \| html %];
1442	[% END %]	1442	[% END %]
1443	$(document).ready(function() {	1443	$(document).ready(function() {
1444		1444





                            [% IF bundle_items && !missing_items %]
                                <div class="dialog message">
                                    <h3>Bundle verified</h3>
                                    <p>The bundle content was verified</p>
                                    <p><a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleContentsModal"><i class="fa fa-eye" aria-hidden="true"></i> View contents list</a></p>
                                </div>
                            [% END %]

                        });
                    } else {
                        feedback.fadeOut(100, function(){
                            string = _("Verified: ")+last;
                            feedback.addClass('alert-success').removeClass('alert-danger').html(string).fadeIn(100);
                        });
                    }
- 

Return to bug 28854

Lines 384-391 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-4 / +3 lines)
384		384
385	[% IF bundle_items && !missing_items %]	385	[% IF bundle_items && !missing_items %]
386	<div class="dialog message">	386	<div class="dialog message">
387	<h3>Bundle varified</h3>	387	<h3>Bundle verified</h3>
388	<p>The bundle content was varified</p>	388	<p>The bundle content was verified</p>
389	<p><a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleContentsModal"><i class="fa fa-eye" aria-hidden="true"></i> View contents list</a></p>	389	<p><a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleContentsModal"><i class="fa fa-eye" aria-hidden="true"></i> View contents list</a></p>
390	</div>	390	</div>
391	[% END %]	391	[% END %]
Lines 1558-1564 Link Here
1558	});	1558	});
1559	} else {	1559	} else {
1560	feedback.fadeOut(100, function(){	1560	feedback.fadeOut(100, function(){
1561	string = _("Varified: ")+last;	1561	string = _("Verified: ")+last;
1562	feedback.addClass('alert-success').removeClass('alert-danger').html(string).fadeIn(100);	1562	feedback.addClass('alert-success').removeClass('alert-danger').html(string).fadeIn(100);
1563	});	1563	});
1564	}	1564	}
1565	-