Attachment 28851 Details for Bug 10519 – Bug 10519 - Suggestions: 'Organize by' and correct display of tab descriptions broken

[patch] Bug 10519 - Suggestions: 'Organize by' and correct display of tab descriptions broken

Bug-10519---Suggestions-Organize-by-and-correct-di.patch (text/plain), 2.60 KB, created by Biblibre Sandboxes on 2014-06-13 20:08:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2014-06-13 20:08:17 UTC

Size: 2.60 KB

patch

obsolete

>From b925a5a014a101588227171556c57dc4f9e3d041 Mon Sep 17 00:00:00 2001
>From: Jacek Ablewicz <abl@biblos.pk.edu.pl>
>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 <cbrannon@cdalibrary.org>
>---
> suggestion/suggestion.pl |    9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
>index 949cca3..2af64ab 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/){
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 10519: 19300 | 19327 | 19340 | 19341 | 19355 | 19356 | 19364 | 28763 | 28850 | 28851 | 28852 | 29598 | 29599 | 29686