Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): fix deps . #1867

Merged
merged 1 commit into from
Oct 10, 2023
Merged

build(deps): fix deps . #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dongtai_conf/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ def safe_execute(default, exception, function, *args):
try:
TANTIVY_INDEX_PATH = config.get("tantivy", "index_path")
except Exception:
TANTIVY_INDEX_PATH = os.path.join(TMP_COMMON_PATH, "tantivy")
TANTIVY_INDEX_PATH = urljoin(TMP_COMMON_PATH, "tantivy")


ELASTICSEARCH_STATE = config.get("elastic_search", "enable") == "true"
Expand Down Expand Up @@ -1099,5 +1099,6 @@ def set_asyncio_policy():
AUTH_LDAP_BIND_PASSWORD = config.get("ldap", "ldap_bind_password", fallback="")

AUTH_LDAP_ALWAYS_UPDATE_USER = False

AUTH_LDAP_READY = AUTH_LDAP_SERVER_URI != ""
# useless
AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=users,dc=example,dc=com"
3 changes: 3 additions & 0 deletions dongtai_web/views/user_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ def get(self, request: Request):
if group.name == "system_admin"
else 0,
"role_name": "" if group is None else group.name,
"role_id": user.role_id,
"sca_setup": not SCA_SETUP,
"enable_totp": bool(user.totp_secret),
"is_wait_binding": user.role_id == 11,
"is_bind_ldap": bool(user.ldap_dn),
}
)
Loading