From a2fa4df79dbd794fa4e80e8599ad73b19f731a0f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 8 Feb 2016 13:00:37 +0000 Subject: [PATCH] Bug 15755: Display default item type as "All" in circ rules Bug 15354 did not fix correctly the issue with the item type display. The default item type '*' should be "All", at the moment nothing is displayed in the column. Test plan: 1/ Define a rule for default item types (All/*) and for specific item types. 2/ Translate some item type descriptions used in previous step 3/ Default item type should be "All" and correct translations should be displayed. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 6d854a167d2843ac2dac690bb69a048006994372) Signed-off-by: Julian Maurice --- admin/smart-rules.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index 1f76fbab1c..ccc6130836 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -443,7 +443,7 @@ $sth2->execute($language, $branch); while (my $row = $sth2->fetchrow_hashref) { $row->{'current_branch'} ||= $row->{'branchcode'}; - $row->{translated_description} ||= $row->{translated_description}; + $row->{humanitemtype} ||= $row->{itemtype}; $row->{default_translated_description} = 1 if $row->{humanitemtype} eq '*'; $row->{'humancategorycode'} ||= $row->{'categorycode'}; $row->{'default_humancategorycode'} = 1 if $row->{'humancategorycode'} eq '*'; -- 2.20.1