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

(-)a/C4/Items.pm (-4 / +12 lines)
Lines 1451-1456 sub SearchItems { Link Here
1451
          LEFT JOIN biblio ON biblio.biblionumber = items.biblionumber
1451
          LEFT JOIN biblio ON biblio.biblionumber = items.biblionumber
1452
          LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber
1452
          LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber
1453
          LEFT JOIN biblio_metadata ON biblio_metadata.biblionumber = biblio.biblionumber
1453
          LEFT JOIN biblio_metadata ON biblio_metadata.biblionumber = biblio.biblionumber
1454
          LEFT JOIN issues ON issues.itemnumber = items.itemnumber
1454
          WHERE 1
1455
          WHERE 1
1455
    };
1456
    };
1456
    if (defined $where_str and $where_str ne '') {
1457
    if (defined $where_str and $where_str ne '') {
Lines 1463-1472 sub SearchItems { Link Here
1463
    my @columns = Koha::Database->new()->schema()->resultset('Item')->result_source->columns;
1464
    my @columns = Koha::Database->new()->schema()->resultset('Item')->result_source->columns;
1464
    push @columns, Koha::Database->new()->schema()->resultset('Biblio')->result_source->columns;
1465
    push @columns, Koha::Database->new()->schema()->resultset('Biblio')->result_source->columns;
1465
    push @columns, Koha::Database->new()->schema()->resultset('Biblioitem')->result_source->columns;
1466
    push @columns, Koha::Database->new()->schema()->resultset('Biblioitem')->result_source->columns;
1466
    my $sortby = (0 < grep {$params->{sortby} eq $_} @columns)
1467
    push @columns, Koha::Database->new()->schema()->resultset('Issue')->result_source->columns;
1467
        ? $params->{sortby} : 'itemnumber';
1468
1468
    my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC';
1469
    if ( $params->{sortby} eq 'availability' ) {
1469
    $query .= qq{ ORDER BY $sortby $sortorder };
1470
        my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC';
1471
        $query .= qq{ ORDER BY onloan $sortorder, damaged $sortorder, withdrawn $sortorder, notforloan $sortorder, itemlost $sortorder };
1472
    } else {
1473
        my $sortby = (0 < grep {$params->{sortby} eq $_} @columns)
1474
            ? $params->{sortby} : 'itemnumber';
1475
        my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC';
1476
        $query .= qq{ ORDER BY $sortby $sortorder };
1477
    }
1470
1478
1471
    my $rows = $params->{rows};
1479
    my $rows = $params->{rows};
1472
    my @limit_args;
1480
    my @limit_args;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-3 / +2 lines)
Lines 337-343 Link Here
337
                + '      <th id="items_widthdrawn">' + _("Withdrawn status") + '</th>'
337
                + '      <th id="items_widthdrawn">' + _("Withdrawn status") + '</th>'
338
                + '      <th id="items_checkouts">' + _("Checkouts") + '</th>'
338
                + '      <th id="items_checkouts">' + _("Checkouts") + '</th>'
339
                + '      <th id="items_availability">' + _("Availability") + '</th>'
339
                + '      <th id="items_availability">' + _("Availability") + '</th>'
340
                + '      <th id="items_duedate">' + _("Due date") + '</th>'
340
                + '      <th id="items_date_due">' + _("Due date") + '</th>'
341
                + '      <th id=""></th>'
341
                + '      <th id=""></th>'
342
                + '    </tr>'
342
                + '    </tr>'
343
            var table = ''
343
            var table = ''
Lines 495-501 Link Here
495
                    { 'sName': 'withdrawn' },
495
                    { 'sName': 'withdrawn' },
496
                    { 'sName': 'issues' },
496
                    { 'sName': 'issues' },
497
                    { 'sName': 'availability' },
497
                    { 'sName': 'availability' },
498
                    { 'sName': 'duedate' },
498
                    { 'sName': 'date_due' },
499
                    { 'sName': 'actions', 'bSortable': false }
499
                    { 'sName': 'actions', 'bSortable': false }
500
                ],
500
                ],
501
                "sPaginationType": "full_numbers",
501
                "sPaginationType": "full_numbers",
502
- 

Return to bug 17748