@@ -, +, @@ --- admin/didyoumean.pl | 5 +---- installer/data/mysql/atomicupdate/bug_20399.sql | 1 + installer/data/mysql/sysprefs.sql | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt | 5 +++-- 4 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_20399.sql --- a/admin/didyoumean.pl +++ a/admin/didyoumean.pl @@ -22,15 +22,12 @@ my ($template, $loggedinuser, $cookie) my $opacplugins = from_json(C4::Context->preference('OPACdidyoumean') || '[]'); -my $intraplugins = from_json(C4::Context->preference('INTRAdidyoumean') || '[]'); - my @pluginlist = Koha::SuggestionEngine::AvailablePlugins(); foreach my $plugin (@pluginlist) { next if $plugin eq 'Koha::SuggestionEngine::Plugin::Null'; next unless (can_load( modules => { "$plugin" => undef } )); push @$opacplugins, { name => $plugin->NAME } unless grep { $_->{name} eq $plugin->NAME } @$opacplugins; - push @$intraplugins, { name => $plugin->NAME } unless grep { $_->{name} eq $plugin->NAME } @$intraplugins; } $template->{VARS}->{OPACpluginlist} = $opacplugins; -$template->{VARS}->{INTRApluginlist} = $intraplugins; + output_html_with_http_headers $input, $cookie, $template->output; --- a/installer/data/mysql/atomicupdate/bug_20399.sql +++ a/installer/data/mysql/atomicupdate/bug_20399.sql @@ -0,0 +1, @@ +DELETE FROM systempreferences WHERE variable='INTRAdidyoumean'; --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -250,7 +250,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'), ('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'), ('OnSiteCheckoutAutoCheck','0','','Enable/Do not enable onsite checkout by default if last checkout was an onsite checkout','YesNo'), -('INTRAdidyoumean','',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'), ('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'), ('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'), ('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -57,10 +57,12 @@ OPAC [% PROCESS pluginlist plugins=OPACpluginlist type='opac' %] +
Cancel
@@ -96,9 +98,8 @@ function yesimeant() { var OPACdidyoumean = serialize_plugins('opac'); - var INTRAdidyoumean = serialize_plugins('intranet'); - var data = "pref_OPACdidyoumean=" + encodeURIComponent(OPACdidyoumean) + "&pref_INTRAdidyoumean=" + encodeURIComponent(INTRAdidyoumean); + var data = "pref_OPACdidyoumean=" + encodeURIComponent(OPACdidyoumean); $.ajax({ data: data, --