Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-LDAP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-LDAP
Commits
ca7b0698
Verified
Commit
ca7b0698
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of edugit.org:AlekSIS/official/AlekSIS-App-LDAP
parents
e41b4f0c
57d717ba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/ldap/preferences.py
+1
-1
1 addition, 1 deletion
aleksis/apps/ldap/preferences.py
aleksis/apps/ldap/util/ldap_sync.py
+2
-1
2 additions, 1 deletion
aleksis/apps/ldap/util/ldap_sync.py
with
3 additions
and
2 deletions
aleksis/apps/ldap/preferences.py
+
1
−
1
View file @
ca7b0698
...
...
@@ -155,6 +155,6 @@ class LDAPGroupSyncOwnerAttrType(ChoicePreference):
class
LDAPPersonSyncOnLogin
(
BooleanPreference
):
section
=
ldap
name
=
"
person_sync_on_login
"
default
=
"
t
rue
"
default
=
T
rue
required
=
False
verbose_name
=
_
(
"
Sync LDAP user with person on login
"
)
This diff is collapsed.
Click to expand it.
aleksis/apps/ldap/util/ldap_sync.py
+
2
−
1
View file @
ca7b0698
...
...
@@ -29,7 +29,8 @@ TQDM_DEFAULTS = {
def
setting_name_from_field
(
model
,
field
):
"""
Generate a setting name from a model field.
"""
return
f
"
additional_field_
{
model
.
_meta
.
label
}
_
{
field
.
name
}
"
part_1
=
model
.
_meta
.
label_lower
.
replace
(
"
.
"
,
"
_
"
)
return
f
"
additional_field_
{
part_1
}
_
{
field
.
name
}
"
def
syncable_fields
(
model
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment