Bugzilla – Attachment 6660 Details for
Bug 7328
Expanded options in advanced search
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 7328 Expanded options in advanced search
SIGNED-OFF-Bug-7328-Expanded-options-in-advanced-s.patch (text/plain), 2.08 KB, created by
Katrin Fischer
on 2011-12-08 06:36:28 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 7328 Expanded options in advanced search
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-12-08 06:36:28 UTC
Size:
2.08 KB
patch
obsolete
>From 70e93147211094fb9730c97389c91fe1bda66a51 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr> >Date: Wed, 7 Dec 2011 08:46:21 +0100 >Subject: [PATCH] [SIGNED-OFF] Bug 7328 Expanded options in advanced search > >In OPAC and intra advanced search, more search options are displayed >depending on expandedSearchOption syspres and user choice. This doesn't >work anymore in HEAD. > >This patch restore this functionnality. > >To test: > > - enable/disable expandedSearchOption. > - Load advanced search page. Limited seach options version is always > displayed > - Apply this patch and see how it works... > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >The problem only appeared in the staff client for me. >Tested both OPAC and staff with patch applied. >--- > catalogue/search.pl | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/catalogue/search.pl b/catalogue/search.pl >index 907efdb..4ff07e4 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -331,13 +331,13 @@ if ( $template_type eq 'advsearch' ) { > my $languages_limit_loop = getAllLanguages(); > $template->param(search_languages_loop => $languages_limit_loop,); > >- # use the global setting by default >- if ( C4::Context->preference("expandedSearchOption") == 1) { >- $template->param( expanded_options => C4::Context->preference("expandedSearchOption") ); >- } >- # but let the user override it >- if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) { >- $template->param( expanded_options => $cgi->param('expanded_options')); >+ # Expanded search options in advanced search: >+ # use the global setting by default, but let the user override it >+ { >+ my $expanded = $cgi->param('expanded_options'); >+ $expanded = C4::Context->preference("expandedSearchOption") || 0 >+ if !defined($expanded) || $expanded !~ /^0|1$/; >+ $template->param( expanded_options => $expanded ); > } > > $template->param(virtualshelves => C4::Context->preference("virtualshelves")); >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7328
:
6633
| 6660