From 73d5823961de370ddb3041afd5ce4ba3a24bf73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nazl=C4=B1=20=C3=87etin?= Date: Fri, 21 Feb 2020 14:13:41 +0000 Subject: [PATCH] Bug 22774: (follow-up) New systempreferences for suggestions --- installer/data/mysql/atomicupdate/bug_22774.perl | 4 ++-- .../prog/en/modules/admin/preferences/opac.pref | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_22774.perl b/installer/data/mysql/atomicupdate/bug_22774.perl index d0e4a06466..e46e40cbaf 100644 --- a/installer/data/mysql/atomicupdate/bug_22774.perl +++ b/installer/data/mysql/atomicupdate/bug_22774.perl @@ -3,8 +3,8 @@ if( CheckVersion( $DBversion ) ) { # you can use $dbh here like: $dbh->do( q{ INSERT IGNORE INTO systempreferences (variable,value,explanation,type) VALUES - ('MaxTotalSuggestions','3','Number of total suggestions','free'), - ('NumberOfSuggestionDays','30','days','free') + ('MaxTotalSuggestions','','Number of total suggestions','Free'), + ('NumberOfSuggestionDays','','days','Free') }); # or perform some test and warn diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index add5ca497f..8f0ef56c95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -701,28 +701,12 @@ OPAC: - pref: MaxOpenSuggestions class: integer - "open suggestions. Leave empty for no limit. **Note: this setting does not affect anonymous suggestions" -<<<<<<< HEAD -======= - - Number of total suggestions - pref: MaxTotalSuggestions - default: 3 class: integer - "for" - pref: NumberOfSuggestionDays - default: 30 - class: integer - - "days." - Privacy: ->>>>>>> Bug 22774: New systempreferences for suggestions - - - - Number of total suggestions - - pref: MaxTotalSuggestions - default: 3 - class: integer - - "for" - - pref: NumberOfSuggestionDays - default: 30 class: integer - "days." Privacy: -- 2.11.0