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

(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-6 / +6 lines)
Lines 161-175 $(document).ready(function() { Link Here
161
161
162
                                    if ( oObj.waiting_here ) {
162
                                    if ( oObj.waiting_here ) {
163
                                        data += __("Item is <strong>waiting here</strong>");
163
                                        data += __("Item is <strong>waiting here</strong>");
164
					if (oObj.desk_name) {
164
                                        if (oObj.desk_name) {
165
					    data += ", " + __("at %s").format( oObj.desk_name );
165
                                            data += ", " + __("at %s").format(oObj.desk_name);
166
					}
166
                                        }
167
                                    } else {
167
                                    } else {
168
                                        data += __("Item is <strong>waiting</strong>");
168
                                        data += __("Item is <strong>waiting</strong>");
169
                                        data += " " + __("at %s").format(oObj.waiting_at);
169
                                        data += " " + __("at %s").format(oObj.waiting_at);
170
					if (oObj.desk_name) {
170
                                        if (oObj.desk_name) {
171
					    data += ", " + __("at %s").format( oObj.desk_name );
171
                                            data += ", " + __("at %s").format(oObj.desk_name);
172
					}
172
                                        }
173
173
174
                                    }
174
                                    }
175
175
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-1 / +1 lines)
Lines 100-106 Link Here
100
                                <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
100
                                <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
101
                                [% IF ( HOLD.is_at_destination ) %]
101
                                [% IF ( HOLD.is_at_destination ) %]
102
                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
102
                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
103
				    [% IF ( HOLD.desk_id ) %], [% Desks.GetName ( HOLD.desk_id ) | html %],[% END %]
103
                                    [% IF ( HOLD.desk_id ) %], [% Desks.GetName ( HOLD.desk_id ) | html %],[% END %]
104
                                    [% IF ( HOLD.waitingdate ) %]
104
                                    [% IF ( HOLD.waitingdate ) %]
105
                                        since [% HOLD.waitingdate | $KohaDates %]
105
                                        since [% HOLD.waitingdate | $KohaDates %]
106
                                        [% IF HOLD.expirationdate %]
106
                                        [% IF HOLD.expirationdate %]
(-)a/t/db_dependent/Koha/Holds.t (-5 / +4 lines)
Lines 373-381 subtest 'Desks' => sub { Link Here
373
    my $library = $builder->build_object( { class => 'Koha::Libraries' } );
373
    my $library = $builder->build_object( { class => 'Koha::Libraries' } );
374
374
375
    my $desk = Koha::Desk->new({
375
    my $desk = Koha::Desk->new({
376
	desk_name  => 'my_desk_name_for_test',
376
        desk_name  => 'my_desk_name_for_test',
377
	branchcode => $library->branchcode ,
377
        branchcode => $library->branchcode ,
378
			       })->store;
378
                               })->store;
379
    ok($desk, "Desk created");
379
    ok($desk, "Desk created");
380
    my $item = $builder->build_sample_item({ library => $library->branchcode });
380
    my $item = $builder->build_sample_item({ library => $library->branchcode });
381
    my $manager = $builder->build_object( { class => "Koha::Patrons" } );
381
    my $manager = $builder->build_object( { class => "Koha::Patrons" } );
Lines 386-392 subtest 'Desks' => sub { Link Here
386
            class => 'Koha::Patrons',
386
            class => 'Koha::Patrons',
387
            value => { branchcode => $library->branchcode, }
387
            value => { branchcode => $library->branchcode, }
388
        }
388
        }
389
	);
389
        );
390
390
391
    my $reserve_id = C4::Reserves::AddReserve(
391
    my $reserve_id = C4::Reserves::AddReserve(
392
        {
392
        {
393
- 

Return to bug 24412