From 3824e95ba1ee275419a657fbd6c42be913fb16ce Mon Sep 17 00:00:00 2001 From: Jacek Ablewicz Date: Wed, 11 Jun 2014 08:51:34 +0200 Subject: [PATCH] Bug 10519: Suggestions: 'Organize by' and correct display of tab descriptions broken The tabbed display in suggestions offers different options to organize the tabs. The descriptions on the tabs and some of the search options were not working correctly, displaying as "Unknown". To test: - Add several suggestions to your installation, make sure you have: - suggestions from different users - suggestions managed by different users - suggestions with different statuses - suggestions with different selected item types Test all the 'organize by' options (except "Organize by: Library" - see note below), make sure that the tabs and search options have correct descriptions and do no longer display as "Unknown". - Add 1 or 2 custom status to SUGGEST_STATUS authorized value. - Verify display is still correct and your new status are displayed. Note: "Organize by: Library" option is currently severely broken (and not easily fixable, especially for 'IndependentBranches' enabled). But this turns out to be a separate issue, with a different underlaying causes, and it's outside the scope of this patch. This should be dealt with later, in it's own bug report. Signed-off-by: Christopher Brannon Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi Signed-off-by: Galen Charlton (cherry picked from commit 17c0c5f9a507d0b34d98e66540f40ebc9de42845) Signed-off-by: Fridolin Somers --- suggestion/suggestion.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index f0da42cfd9..eb369a6a49 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -59,10 +59,13 @@ sub Init{ sub GetCriteriumDesc{ my ($criteriumvalue,$displayby)=@_; - unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) { - return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown"; + if ($displayby =~ /status/i) { + if ( grep { /^($criteriumvalue)$/ } qw(ASKED ACCEPTED REJECTED CHECKED ORDERED AVAILABLE) ) { + return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))); + } else { + return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue) || $criteriumvalue; + } } - return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ -- 2.39.5