Bugzilla – Attachment 102566 Details for
Bug 20484
Always show Elasticsearch configuration page when permission is set
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20484: Allow configuration of ES before switching to ES
Bug-20484-Allow-configuration-of-ES-before-switchi.patch (text/plain), 6.52 KB, created by
Andrew Fuerste-Henry
on 2020-04-08 12:50:08 UTC
(
hide
)
Description:
Bug 20484: Allow configuration of ES before switching to ES
Filename:
MIME Type:
Creator:
Andrew Fuerste-Henry
Created:
2020-04-08 12:50:08 UTC
Size:
6.52 KB
patch
obsolete
>From e2f60ad9b73dde50238bfc15e6965a3d19aa3346 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 8 Apr 2020 10:11:38 +0000 >Subject: [PATCH] Bug 20484: Allow configuration of ES before switching to ES > >To test: >1 - Set SearchEngine syspref to Zebra >2 - Be a user with permission to manage search engine configuration (manage_search_engine_config) >3 - Confirm you do not see 'Search engine configuration' on Admin main page >4 - Apply patch >5 - Confirm you see it with '(Elasticsearch)' appended >6 - Be a user without above permission >7 - Confirm you cannot see the 'Search engine configuration' >8 - Confirm you cannot access directly: > /cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 6 +++--- > .../prog/en/modules/admin/searchengine/elasticsearch/mappings.tt | 6 +++--- > 3 files changed, 9 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >index c5bd432b9e..53d1610c4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >@@ -65,7 +65,7 @@ > </ul> > [% END %] > >- [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || (Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config) ) %] >+ [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config ) %] > <h5>Catalog</h5> > <ul> > [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >@@ -88,8 +88,8 @@ > [% IF ( CAN_user_parameters_manage_item_search_fields ) %] > <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></li> > [% END %] >- [% IF ( Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config ) %] >- <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration</a></li> >+ [% IF ( CAN_user_parameters_manage_search_engine_config ) %] >+ <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li> > [% END %] > </ul> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index fded276005..82d766f6c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -135,7 +135,7 @@ > </div> > > <div class="col-md-6 sysprefs"> >- [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || (Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config) ) %] >+ [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config ) %] > <h3>Catalog</h3> > <dl> > [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >@@ -166,8 +166,8 @@ > <dt><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></dt> > <dd>Manage custom fields for item search.</dd> > [% END %] >- [% IF ( Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config ) %] >- <dt><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration</a></dt> >+ [% IF ( CAN_user_parameters_manage_search_engine_config ) %] >+ <dt><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></dt> > <dd>Manage indexes, facets, and their mappings to MARC fields and subfields.</dd> > [% END %] > </dl> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index e3a207db96..92043e08c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Administration › Search engine configuration</title> >+<title>Koha › Administration › Search engine configuration (Elasticsearch)</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.tablednd.js") | $raw %] > <script> >@@ -68,7 +68,7 @@ a.add, a.delete { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'prefs-admin-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Search engine configuration</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Search engine configuration (Elasticsearch)</div> > > <div class="main container-fluid"> > <div class="row"> >@@ -101,7 +101,7 @@ a.add, a.delete { > </div> > [% END %] > >- <h1>Search engine configuration</h1> >+ <h1>Search engine configuration (Elasticsearch)</h1> > <div class="dialog message"> > Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly. > >-- >2.11.0
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 20484
:
102549
|
102566
|
103195
|
103362