From 6e406311c3fd3297affd52eabf455ee9f2e5f207 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 2 Apr 2021 08:40:29 +0200
Subject: [PATCH] Fix #1928 (ldap_import_user_filter missing in to_save)

---
 .gitignore             | 2 +-
 cps/admin.py           | 2 +-
 cps/static/js/table.js | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 109de4ef..cbf29ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,4 @@ vendor/
 settings.yaml
 gdrive_credentials
 client_secrets.json
-
+gmail.json
diff --git a/cps/admin.py b/cps/admin.py
index a6af15b5..3b2c237d 100644
--- a/cps/admin.py
+++ b/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:
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index a27b998e..d9711b55 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -140,7 +140,6 @@ $(function() {
                             field: key,
                             value: data[key]
                         });
-                        // console.log(data);
                     }
                 });
             }