Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
6e406311
Commit
6e406311
authored
Apr 02, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #1928 (ldap_import_user_filter missing in to_save)
parent
c0623a94
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
.gitignore
.gitignore
+1
-1
admin.py
cps/admin.py
+1
-1
table.js
cps/static/js/table.js
+0
-1
No files found.
.gitignore
View file @
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
cps/admin.py
View file @
6e406311
...
@@ -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
:
...
...
cps/static/js/table.js
View file @
6e406311
...
@@ -140,7 +140,6 @@ $(function() {
...
@@ -140,7 +140,6 @@ $(function() {
field
:
key
,
field
:
key
,
value
:
data
[
key
]
value
:
data
[
key
]
});
});
// console.log(data);
}
}
});
});
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment