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
647bbd8c
Verified
Commit
647bbd8c
authored
4 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
[Reformat] Rename wrong variables
parent
34120740
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/ldap/apps.py
+1
-1
1 addition, 1 deletion
aleksis/apps/ldap/apps.py
aleksis/apps/ldap/util/ldap_sync.py
+5
-7
5 additions, 7 deletions
aleksis/apps/ldap/util/ldap_sync.py
with
6 additions
and
8 deletions
aleksis/apps/ldap/apps.py
+
1
−
1
View file @
647bbd8c
...
@@ -15,7 +15,7 @@ class LDAPConfig(AppConfig):
...
@@ -15,7 +15,7 @@ class LDAPConfig(AppConfig):
"
Repository
"
:
"
https://edugit.org/AlekSIS/official/AlekSIS-App-LDAP/
"
,
"
Repository
"
:
"
https://edugit.org/AlekSIS/official/AlekSIS-App-LDAP/
"
,
}
}
licence
=
"
EUPL-1.2+
"
licence
=
"
EUPL-1.2+
"
copyright
=
(
copyright
_info
=
(
([
2020
],
"
Dominik George
"
,
"
dominik.george@teckids.org
"
),
([
2020
],
"
Dominik George
"
,
"
dominik.george@teckids.org
"
),
([
2020
],
"
Tom Teichler
"
,
"
tom.teichler@teckids.org
"
),
([
2020
],
"
Tom Teichler
"
,
"
tom.teichler@teckids.org
"
),
)
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/ldap/util/ldap_sync.py
+
5
−
7
View file @
647bbd8c
...
@@ -85,10 +85,8 @@ def update_dynamic_preferences():
...
@@ -85,10 +85,8 @@ def update_dynamic_preferences():
section
=
section_ldap
section
=
section_ldap
name
=
setting_name
+
"
_re
"
name
=
setting_name
+
"
_re
"
verbose_name
=
_
(
verbose_name
=
_
(
f
(
f
"
Regular expression to match LDAP value for
"
"
Regular expression to match LDAP value for
"
"
{field.verbose_name} on {model._meta.label} against
"
"
{field.verbose_name} on {model._meta.label} against
"
)
)
)
required
=
False
required
=
False
default
=
""
default
=
""
...
@@ -143,13 +141,13 @@ def ldap_sync_user_on_login(sender, instance, created, **kwargs):
...
@@ -143,13 +141,13 @@ def ldap_sync_user_on_login(sender, instance, created, **kwargs):
instance
,
instance
.
ldap_user
.
dn
,
instance
.
ldap_user
.
attrs
.
data
instance
,
instance
.
ldap_user
.
dn
,
instance
.
ldap_user
.
attrs
.
data
)
)
except
Person
.
DoesNotExist
:
except
Person
.
DoesNotExist
:
logger
.
warn
(
f
"
No matching person for user
{
user
.
username
}
"
)
logger
.
warn
(
f
"
No matching person for user
{
instance
.
username
}
"
)
return
return
except
Person
.
MultipleObjectsReturned
:
except
Person
.
MultipleObjectsReturned
:
logger
.
error
(
f
"
More than one matching person for user
{
user
.
username
}
"
)
logger
.
error
(
f
"
More than one matching person for user
{
instance
.
username
}
"
)
return
return
except
(
DataError
,
IntegrityError
,
ValueError
)
as
e
:
except
(
DataError
,
IntegrityError
,
ValueError
)
as
e
:
logger
.
error
(
f
"
Data error while synchronising user
{
user
.
username
}
:
\n
{
e
}
"
)
logger
.
error
(
f
"
Data error while synchronising user
{
instance
.
username
}
:
\n
{
e
}
"
)
return
return
if
get_site_preferences
()[
"
ldap__enable_group_sync
"
]:
if
get_site_preferences
()[
"
ldap__enable_group_sync
"
]:
...
...
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