gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 13195 - Regression: Circulation checkouts table no longer shows item type description 

Another regression caused by Bug 11703: The list of checkouts on the
circulation and patron detail page shows item type codes instead of the
full description.

Test Plan:
1) View a patron's checkouts, note the Item type column displays the
   code rather than the description.
2) Apply this patch
3) Refresh the page, note the description is now displayed

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

Works as described.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Works as described, no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
This commit is contained in:
Kyle M Hall 2014-11-13 11:04:17 -05:00 committed by Mason James
parent cb8332e1a6
commit 9ffc39b8bf
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
View File

@ -216,7 +216,7 @@ $(document).ready(function() {
return title;
}
},
{ "mDataProp": "itemtype" },
{ "mDataProp": "itemtype_description" },
{ "mDataProp": "issuedate_formatted" },
{ "mDataProp": "branchname" },
{ "mDataProp": "itemcallnumber" },

20
svc/checkouts
View File

@ -46,9 +46,12 @@ my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;
my @borrowernumber = $input->param('borrowernumber');
my $offset = $input->param('iDisplayStart');
my $results_per_page = $input->param('iDisplayLength') || -1;
my $sorting_column = $sort_columns[ $input->param('iSortCol_0') ]
|| 'issuedate';
my $sorting_direction = $input->param('sSortDir_0') eq 'asc' ? 'asc' : 'desc';
my $sorting_column = $input->param('iSortCol_0') || q{};
$sorting_column = ( $sorting_column && $sort_columns[$sorting_column] ) ? $sort_columns[$sorting_column] : 'issuedate';
my $sorting_direction = $input->param('sSortDir_0') || q{};
$sorting_direction = $sorting_direction eq 'asc' ? 'asc' : 'desc';
$results_per_page = undef if ( $results_per_page == -1 );
@ -76,8 +79,10 @@ my $sql = '
issues.branchcode,
branchname,
itype,
itemtype,
items.itype,
itemtype_item.description AS itype_description,
biblioitems.itemtype,
itemtype_bib.description AS itemtype_description,
borrowernumber,
surname,
@ -94,6 +99,8 @@ my $sql = '
LEFT JOIN biblioitems USING ( biblionumber )
LEFT JOIN borrowers USING ( borrowernumber )
LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
LEFT JOIN itemtypes itemtype_bib ON ( biblioitems.itemtype = itemtype_bib.itemtype )
LEFT JOIN itemtypes itemtype_item ON ( items.itype = itemtype_item.itemtype )
WHERE borrowernumber
';
@ -121,7 +128,7 @@ while ( my $c = $sth->fetchrow_hashref() ) {
my ( $can_renew, $can_renew_error ) =
CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
my $can_renew_date =
$can_renew_error eq 'too_soon'
$can_renew_error && $can_renew_error eq 'too_soon'
? output_pref(
{
dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
@ -139,6 +146,7 @@ while ( my $c = $sth->fetchrow_hashref() ) {
author => $c->{author},
barcode => $c->{barcode},
itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype},
itemtype_description => $item_level_itypes ? $c->{itype_description} : $c->{itemtype_description},
itemnotes => $c->{itemnotes},
branchcode => $c->{branchcode},
branchname => $c->{branchname},