From 999f2ed7e9e56dda254308f9bbbc85dcc66a160c Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 27 Oct 2017 11:38:51 +0000
Subject: [PATCH] Bug 19538: Move EnableAdvancedCatalogingEdtor from 'Labs' to
 'Cataloging'

To test:
1 - View sysprefs
2 - Note 'Labs' tab
3 - Note EnableAdvancedCatalogingEditor is the only pref there
4 - Note that prefs works
5 - Apply patch
6 - Note 'Labs' tba is gone
7 - Check the 'Cataloging' tab (under Interface)
8 - There it is!
9 - Verify it still works

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Maksim Sen <maksim.sen@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc     |  1 -
 .../en/modules/admin/preferences/cataloguing.pref     |  9 +++++++++
 .../prog/en/modules/admin/preferences/labs.pref       | 11 -----------
 3 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index 0482478821..3b2e2f75ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -7,7 +7,6 @@
 [% IF ( circulation ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
 [% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced content</a></li>
 [% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Internationalization and localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
-[% IF ( labs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Experimental features" href="/cgi-bin/koha/admin/preferences.pl?tab=labs">Labs</a></li>
 [% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">Local use</a></li>
 [% IF ( logs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Transaction logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
 [% IF ( opac ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 0d61fe7b22..f8afdc939f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -18,6 +18,15 @@ Cataloging:
                   yes: Display
                   no: "Don't Display"
             - easy ways to create analytical record relationships
+        -
+            - pref: EnableAdvancedCatalogingEditor
+              default: 0
+              choices:
+                  yes: Enable
+                  no: "Don't enable"
+            - the advanced cataloging editor.
+            - "<br/> NOTE:"
+            - Currently does not include support for UNIMARC or NORMARC fixed fields.
     Spine Labels:
         -
             - When using the quick spine label printer,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref
deleted file mode 100644
index 34fb6cd5c4..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref
+++ /dev/null
@@ -1,11 +0,0 @@
-Labs:
-    All:
-        -
-            - pref: EnableAdvancedCatalogingEditor
-              default: 0
-              choices:
-                  yes: Enable
-                  no: "Don't enable"
-            - the advanced cataloging editor.
-            - "<br/> NOTE:"
-            - This feature is currently experimental, and may have bugs that cause corruption of records. It also does not include any support for UNIMARC or NORMARC fixed fields. Please help us test it and report any bugs, but do so at your own risk.
-- 
2.39.5