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

(-)a/Koha/Hold.pm (-1 / +1 lines)
Lines 884-890 sub hold_group { Link Here
884
        return Koha::HoldGroups->find( $self->hold_group_id );
884
        return Koha::HoldGroups->find( $self->hold_group_id );
885
    }
885
    }
886
886
887
    return undef;
887
    return;
888
}
888
}
889
889
890
=head3 _move_to_old
890
=head3 _move_to_old
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 4578-4584 CREATE TABLE `reserves` ( Link Here
4578
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
4578
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
4579
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
4579
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
4580
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
4580
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
4581
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE SET NULL ON UPDATE CASCADE
4581
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE SET NULL ON UPDATE CASCADE,
4582
  CONSTRAINT `reserves_ibfk_7` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_groups` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
4582
  CONSTRAINT `reserves_ibfk_7` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_groups` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
4583
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4583
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4584
/*!40101 SET character_set_client = @saved_cs_client */;
4584
/*!40101 SET character_set_client = @saved_cs_client */;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-1 / +1 lines)
Lines 187-193 Link Here
187
                    <br><i>Non priority hold</i>
187
                    <br><i>Non priority hold</i>
188
                [%- END -%]
188
                [%- END -%]
189
                [% IF hold.hold_group_id %]
189
                [% IF hold.hold_group_id %]
190
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id %]" class="hold-group">hold group</a>)</div>
190
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
191
                [% END %]
191
                [% END %]
192
            </td>
192
            </td>
193
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
193
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +1 lines)
Lines 191-197 Link Here
191
                    <strong>[% itemsloo.barcode | html %]</strong> <em>or any available</em>
191
                    <strong>[% itemsloo.barcode | html %]</strong> <em>or any available</em>
192
                [% END %]
192
                [% END %]
193
                [% IF itemsloo.hold_group_id %]
193
                [% IF itemsloo.hold_group_id %]
194
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% itemsloo.hold_group_id %]" class="hold-group">hold group</a>)</div>
194
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% itemsloo.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
195
                [% END %]
195
                [% END %]
196
            </td>
196
            </td>
197
            <td class="hq-patron">
197
            <td class="hq-patron">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt (-2 / +2 lines)
Lines 20-27 Link Here
20
            [% biblio = hold.biblio %]
20
            [% biblio = hold.biblio %]
21
            <tr>
21
            <tr>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td>
23
              <td>[% hold.priority %]</td>
23
              <td>[% hold.priority | html %]</td>
24
              <td>[% hold.reservenotes %]</td>
24
              <td>[% hold.reservenotes | html %]</td>
25
            </tr>
25
            </tr>
26
          [% END %]
26
          [% END %]
27
        </tbody>
27
        </tbody>
(-)a/reserve/hold-group.pl (-4 / +2 lines)
Lines 22-33 use C4::Auth; Link Here
22
use C4::Output;
22
use C4::Output;
23
use Koha::HoldGroups;
23
use Koha::HoldGroups;
24
24
25
my $cgi = new CGI;
25
my $cgi = CGI->new;
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
26
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
27
    template_name   => "reserve/hold-group.tt",
27
    template_name   => "reserve/hold-group.tt",
28
    query           => $cgi,
28
    query           => $cgi,
29
    type            => "intranet",
29
    type            => "intranet",
30
    authnotrequired => 0,
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
30
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
32
});
31
});
33
32
34
- 

Return to bug 15516