Commit 389f0ae4 authored by cbartondock's avatar cbartondock

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

parents 00a24756 6e406311
...@@ -30,4 +30,4 @@ vendor/ ...@@ -30,4 +30,4 @@ vendor/
settings.yaml settings.yaml
gdrive_credentials gdrive_credentials
client_secrets.json client_secrets.json
gmail.json
...@@ -771,7 +771,7 @@ def _configuration_ldap_check(reboot_required, to_save, gdrive_error): ...@@ -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'), return reboot_required, _configuration_result(_('LDAP User Object Filter Has Unmatched Parenthesis'),
gdrive_error) 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 = "" config.config_ldap_member_user_object = ""
else: else:
if config.config_ldap_member_user_object.count("%s") != 1: if config.config_ldap_member_user_object.count("%s") != 1:
......
...@@ -140,7 +140,6 @@ $(function() { ...@@ -140,7 +140,6 @@ $(function() {
field: key, field: key,
value: data[key] value: data[key]
}); });
// console.log(data);
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment