From 6e3b18d09738bade6dc041ac4261c9bb65a0b71e Mon Sep 17 00:00:00 2001 From: Ethan Amohia Date: Thu, 17 Jan 2019 01:44:22 +0000 Subject: [PATCH] Bug 20238: Description of ITEMTYPECAT now shows on itemtypes summary table Test plan: 1. From homepage, go to Koha Amdinistration 2. Go to Authorised Values 3. Scroll down to ITEMTYPECAT and click Add 4. Give the new authorised value an Authorised value and Description 5. Save it 6. On the left, go to Item types 7. Click Edit on an item type 8. Under Search Catergory, select the new authorised value you just created. It should appear in the dropdown as it's description 9. Click Save changes 10. Under Search category for the item type you just edited, you should see your new authorised values' description Signed-off-by: Pierre-Marc Thibault --- Koha/Illbackends/BLDSS | 1 + Koha/Illbackends/koha-ill-freeform | 1 + admin/itemtypes.pl | 2 ++ koha-ill-freeform | 1 + .../prog/en/modules/admin/.itemtypes.tt.swp | Bin 0 -> 40960 bytes .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 4 +++- 6 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 Koha/Illbackends/BLDSS create mode 160000 Koha/Illbackends/koha-ill-freeform create mode 160000 koha-ill-freeform create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/.itemtypes.tt.swp diff --git a/Koha/Illbackends/BLDSS b/Koha/Illbackends/BLDSS new file mode 160000 index 0000000..39f98e6 --- /dev/null +++ b/Koha/Illbackends/BLDSS @@ -0,0 +1 @@ +Subproject commit 39f98e6f8028f5f152e5028582c94ae683a20f62 diff --git a/Koha/Illbackends/koha-ill-freeform b/Koha/Illbackends/koha-ill-freeform new file mode 160000 index 0000000..a52db29 --- /dev/null +++ b/Koha/Illbackends/koha-ill-freeform @@ -0,0 +1 @@ +Subproject commit a52db29936a520c1f84e08b7d2a54b16cba12cc5 diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index d397fee..33663fb 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -169,8 +169,10 @@ if ( $op eq 'add_form' ) { if ( $op eq 'list' ) { my $itemtypes = Koha::ItemTypes->search; + my $searchcategory = GetAuthorisedValues("ITEMTYPECAT"); $template->param( itemtypes => $itemtypes, + searchcategory => $searchcategory, messages => \@messages, ); } diff --git a/koha-ill-freeform b/koha-ill-freeform new file mode 160000 index 0000000..a52db29 --- /dev/null +++ b/koha-ill-freeform @@ -0,0 +1 @@ +Subproject commit a52db29936a520c1f84e08b7d2a54b16cba12cc5 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/.itemtypes.tt.swp b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/.itemtypes.tt.swp new file mode 100644 index 0000000000000000000000000000000000000000..93065d9ea86ed7ffd2d4180661041dfebc13f174 GIT binary patch literal 40960 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 literal 0 HcmV?d00001 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 84180cb..4f4009f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -364,7 +364,9 @@ Item types administration [% itemtype.description | html %] [% END %] - [% itemtype.searchcategory | html %] + + [% AuthorisedValues.GetByCode( 'ITEMTYPECAT', itemtype.searchcategory ) | html %] + [% IF ( itemtype.notforloan ) %]Yes[% ELSE %] [% END %] [% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %] -- 2.7.4