Attachment 42066 Details for Bug 12478 – Bug 12478: Remove Solr occurrences reintroduced by a previous patch

[patch] Bug 12478: Remove Solr occurrences reintroduced by a previous patch

Bug-12478-Remove-Solr-occurrences-reintroduced-by-.patch (text/plain), 2.15 KB, created by Jonathan Druart on 2015-08-28 11:38:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-08-28 11:38:51 UTC

Size: 2.15 KB

patch

obsolete

>From 5882839415d9a8d4d2f5fda5f35a5da84a7eab56 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 28 Aug 2015 11:13:45 +0100
>Subject: [PATCH] Bug 12478: Remove Solr occurrences reintroduced by a previous
> patch
>
>---
> installer/data/mysql/sysprefs.sql                                    | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 2fe7190..00598a4 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -366,7 +366,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
> ('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
> ('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),
>-('SearchEngine','Zebra','Elasticsearch|Solr|Zebra','Search Engine','Choice'),
>+('SearchEngine','Zebra','Elasticsearch|Zebra','Search Engine','Choice'),
> ('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
> ('SelfCheckHelpMessage','','70|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
> ('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>index 24e822c..07fb672 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>@@ -169,7 +169,6 @@ Administration:
>             - pref: SearchEngine
>               default: Zebra
>               choices:
>-                Solr: Solr
>                 Zebra: Zebra
>                 Elasticsearch: Elasticsearch
>             - is the search engine used.
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 12478: 29204 | 31128 | 31129 | 33136 | 33137 | 33138 | 33139 | 33140 | 33141 | 35654 | 40903 | 42030 | 42031 | 42032 | 42033 | 42062 | 42063 | 42064 | 42065 | 42066 | 42067 | 42068 | 42069 | 42392 | 42393 | 43127 | 43128 | 43129 | 43130 | 43131 | 43132 | 43133 | 43134 | 43140 | 43141 | 43142 | 43148 | 43345 | 43346 | 43347 | 43348 | 43349 | 43350 | 43351 | 43352 | 43373 | 47767 | 47768 | 50115 | 50159 | 50211 | 50212 | 50213 | 50214 | 50245 | 50246 | 50291 | 50292