From 0fab2c603e3a34a6fc13731cb91b5c5471e72411 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 12 Apr 2017 20:37:12 +0530
Subject: [PATCH] Dont allow GUI prefs to override userdb

---
 src/calibre/gui2/preferences/server.py | 5 +++--
 src/calibre/srv/opts.py                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/preferences/server.py b/src/calibre/gui2/preferences/server.py
index e291051b14..fd75116462 100644
--- a/src/calibre/gui2/preferences/server.py
+++ b/src/calibre/gui2/preferences/server.py
@@ -71,6 +71,7 @@ class Float(QDoubleSpinBox):
     def __init__(self, name, layout):
         QDoubleSpinBox.__init__(self)
         self.setRange(0, 10000)
+        self.setDecimals(1)
         opt = options[name]
         self.valueChanged.connect(self.changed_signal.emit)
         init_opt(self, opt, layout)
@@ -133,7 +134,7 @@ class AdvancedTab(QWidget):
         self.widgets = []
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
         for name in sorted(options, key=lambda n:options[n].shortdoc.lower()):
-            if name in ('auth', 'port', 'allow_socket_preallocation'):
+            if name in ('auth', 'port', 'allow_socket_preallocation', 'userdb'):
                 continue
             opt = options[name]
             if opt.choices:
@@ -387,7 +388,7 @@ class ConfigWidget(ConfigWidgetBase):
             settings.update(getattr(tab, 'settings', {}))
         if settings['auth']:
             from calibre.srv.users import UserManager
-            if not UserManager(settings['userdb']).all_user_names:
+            if not UserManager().all_user_names:
                 error_dialog(self, _('No users specified'), _(
                     'You have turned on the setting to require passwords to access'
                     ' the content server, but you have not created any user accounts.'
diff --git a/src/calibre/srv/opts.py b/src/calibre/srv/opts.py
index 10330ba758..a1d90a741b 100644
--- a/src/calibre/srv/opts.py
+++ b/src/calibre/srv/opts.py
@@ -148,7 +148,7 @@ raw_options = (
     _('Comma separated list of user-defined metadata fields that will not be displayed'
       ' by the content server in the /opds and /mobile views.'),
 
-    _('Only display user-defined fields'),
+    _('Restrict displayed user-defined fields'),
     'displayed_fields', None,
     _('Comma separated list of user-defined metadata fields that will be displayed'
       ' by the content server in the /opds and /mobile views. If you specify this'