@@ -, +, @@ --- Koha/Hold.pm | 2 +- installer/data/mysql/kohastructure.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt | 4 ++-- reserve/hold-group.pl | 5 ++--- 6 files changed, 8 insertions(+), 9 deletions(-) --- a/Koha/Hold.pm +++ a/Koha/Hold.pm @@ -653,7 +653,7 @@ sub hold_group { return Koha::HoldGroups->find( $self->hold_group_id ); } - return undef; + return; } =head3 _move_to_old --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -4349,7 +4349,7 @@ CREATE TABLE `reserves` ( CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE SET NULL ON UPDATE CASCADE + CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `reserves_ibfk_7` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_groups` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -178,7 +178,7 @@
Non priority hold [% END %] [% IF hold.hold_group_id %] -
(part of a hold group)
+
(part of a hold group)
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -182,7 +182,7 @@ [% itemsloo.barcode | html %] or any available [% END %] [% IF itemsloo.hold_group_id %] -
(part of a hold group)
+
(part of a hold group)
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt @@ -20,8 +20,8 @@ [% biblio = hold.biblio %] [% biblio.title | html %] - [% hold.priority %] - [% hold.reservenotes %] + [% hold.priority | html %] + [% hold.reservenotes | html %] [% END %] --- a/reserve/hold-group.pl +++ a/reserve/hold-group.pl @@ -22,12 +22,11 @@ use C4::Auth; use C4::Output; use Koha::HoldGroups; -my $cgi = new CGI; -my ($template, $loggedinuser, $cookie) = get_template_and_user({ +my $cgi = CGI->new; +my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({ template_name => "reserve/hold-group.tt", query => $cgi, type => "intranet", - authnotrequired => 0, flagsrequired => { circulate => 'circulate_remaining_permissions' }, }); --