From ed2390f999121cd210651d81021f090b6aaada23 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Fri, 13 Sep 2019 10:55:30 -0300 Subject: [PATCH] Bug 23602: Display branch limitations in itemtype table This patch adds a column in itemtype table to display branch limitations. To test: 1) Open item types admin page. CHECK => there is no column for branch limitations, even if you add a limitation in an item type. 2) Apply this patch SUCCESS => A new column appears that displays branch limitations per item type 3) Sign off Signed-off-by: Owen Leonard Signed-off-by: Maryse Simard Signed-off-by: Martin Renvoize --- admin/itemtypes.pl | 10 ++++++++-- .../prog/en/modules/admin/itemtypes.tt | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index 80b13c6888..05f394e053 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -196,9 +196,15 @@ if ( $op eq 'add_form' ) { } if ( $op eq 'list' ) { - my $itemtypes = Koha::ItemTypes->search; + my @itypes = Koha::ItemTypes->search->as_list; + my @itemtypes; + foreach my $itype (@itypes) { + my $itemtype = $itype->unblessed; + $itemtype->{branches} = $itype->library_limits ? $itype->library_limits->as_list : []; + push @itemtypes, $itemtype; + } $template->param( - itemtypes => $itemtypes, + itemtypes => \@itemtypes, messages => \@messages, ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 6ac7988e60..715a71b716 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -359,6 +359,7 @@ Item types administration Default replacement cost Processing fee (when lost) Checkin message + Branches limitations Actions [% FOREACH itemtype IN itemtypes %] @@ -411,6 +412,22 @@ Item types administration [% itemtype.defaultreplacecost | $Price %] [% itemtype.processfee | $Price %] [% itemtype.checkinmsg | html_line_break | $raw %] + + [% IF itemtype.branches.size > 0 %] + [% branches_str = "" %] + [% FOREACH branch IN itemtype.branches %] + [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] + [% END %] + + [% IF itemtype.branches.size > 1 %] + [% itemtype.branches.size | html %] branches limitations + [% ELSE %] + [% itemtype.branches.size | html %] branch limitation + [% END %] + [% ELSE %] + No limitation + [% END %] + Edit Delete -- 2.39.5