Merge branch 'master' of https://github.com/janeczku/calibre-web

.gitignore

@@ -30,4 +30,4 @@ vendor/
 settings.yaml
 gdrive_credentials
 client_secrets.json
-
+gmail.json

cps/admin.py

@@ -771,7 +771,7 @@ def _configuration_ldap_check(reboot_required, to_save, gdrive_error):
         return reboot_required, _configuration_result(_('LDAP User Object Filter Has Unmatched Parenthesis'),
                                                       gdrive_error)
 
-    if to_save["ldap_import_user_filter"] == '0':
+    if "ldap_import_user_filter" in to_save and to_save["ldap_import_user_filter"] == '0':
         config.config_ldap_member_user_object = ""
     else:
         if config.config_ldap_member_user_object.count("%s") != 1:

cps/static/js/table.js

@@ -140,7 +140,6 @@ $(function() {
                             field: key,
                             value: data[key]
                         });
-                        // console.log(data);
                     }
                 });
             }