Attachment 52795 Details for Bug 15758 – Bug 15758: Koha::Libraries - Do not select an option if selected is defined

[patch] Bug 15758: Koha::Libraries - Do not select an option if selected is defined

Bug-15758-KohaLibraries---Do-not-select-an-option-.patch (text/plain), 2.32 KB, created by Jonathan Druart on 2016-06-24 12:48:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-06-24 12:48:30 UTC

Size: 2.32 KB

patch

obsolete

>From 5e5b2618c5fb55d9e45f5ac006ad6407f0aea381 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 8 Feb 2016 17:17:31 +0000
>Subject: [PATCH] Bug 15758: Koha::Libraries - Do not select an option if
> selected is defined
>
>This will certainly need a few more tweaks.
>---
> Koha/Template/Plugin/Branches.pm          | 4 ++--
> t/db_dependent/Template/Plugin/Branches.t | 4 +++-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm
>index b41d3e4..3d17edc 100644
>--- a/Koha/Template/Plugin/Branches.pm
>+++ b/Koha/Template/Plugin/Branches.pm
>@@ -65,8 +65,8 @@ sub all {
>       : Koha::Libraries->search_filtered( {}, { order_by => ['branchname'] } )->unblessed;
> 
>     for my $l ( @$libraries ) {
>-        if (       $selected and $l->{branchcode} eq $selected
>-            or not $selected and C4::Context->userenv and $l->{branchcode} eq C4::Context->userenv->{branch}
>+        if (       defined $selected and $l->{branchcode} eq $selected
>+            or not defined $selected and C4::Context->userenv and $l->{branchcode} eq C4::Context->userenv->{branch}
>         ) {
>             $l->{selected} = 1;
>         }
>diff --git a/t/db_dependent/Template/Plugin/Branches.t b/t/db_dependent/Template/Plugin/Branches.t
>index 8fcc15f..24b6e6c 100644
>--- a/t/db_dependent/Template/Plugin/Branches.t
>+++ b/t/db_dependent/Template/Plugin/Branches.t
>@@ -16,7 +16,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 14;
>+use Test::More tests => 15;
> 
> use C4::Context;
> use Koha::Database;
>@@ -71,6 +71,8 @@ is( grep ( { $_->{branchcode} eq 'ANOTHERLIB' and not exists $_->{selected} } @$
> $libraries = $plugin->all( { selected => 'ANOTHERLIB' } );
> is( grep ( { $_->{branchcode} eq 'MYLIBRARY'  and not exists $_->{selected} } @$libraries ), 1, 'With selected parameter, my library should not be preselected' );
> is( grep ( { $_->{branchcode} eq 'ANOTHERLIB' and $_->{selected} == 1 } @$libraries ),       1, 'With selected parameter, other library should be preselected' );
>+$libraries = $plugin->all( { selected => '' } );
>+is( grep ( { exists $_->{selected} } @$libraries ), 0, 'With selected parameter set to an empty string, no library should be preselected' );
> 
> C4::Context->set_preference( 'IndependentBranches', 1 );
> $libraries = $plugin->all();
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 15758: 47746 | 47747 | 47748 | 47749 | 47750 | 47751 | 47752 | 47753 | 47759 | 47760 | 47761 | 47762 | 47763 | 47764 | 47765 | 52723 | 52724 | 52726 | 52727 | 52728 | 52729 | 52730 | 52731 | 52736 | 52788 | 52789 | 52790 | 52791 | 52792 | 52793 | 52794 | 52795 | 52913 | 52914 | 52915 | 52916 | 52917 | 52918 | 52919 | 52920 | 53893 | 53894 | 53895 | 53896 | 53897 | 53898 | 53899 | 53900 | 53997 | 53998 | 53999 | 54000 | 54001 | 54002 | 54003 | 54004 | 54029 | 54030 | 54031 | 54032 | 54033 | 54034 | 54035 | 54036 | 54037 | 54038 | 54039 | 54040 | 54041 | 54042 | 54043 | 54044 | 54861 | 54862 | 54863 | 54864 | 54865 | 54866 | 54867 | 54868 | 54908 | 54909 | 54921 | 54925 | 55061 | 55062 | 55063 | 55064 | 55065 | 55066 | 55067 | 55068 | 55069 | 55070 | 55071 | 55072 | 55073 | 55346 | 55347 | 55348 | 55349 | 55350 | 55351 | 55352 | 55353 | 55354 | 55355 | 55356 | 55357 | 55358 | 55445