Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nounous
re2o
Commits
7cafc9e9
Commit
7cafc9e9
authored
Jul 20, 2018
by
moamoak
Browse files
Merge branch 'get_shadow_expirefunc' into 'master'
Function for shadow expire See merge request federez/re2o!187
parents
cfa6fe09
fe378e79
Changes
1
Hide whitespace changes
Inline
Side-by-side
users/models.py
View file @
7cafc9e9
...
...
@@ -321,6 +321,14 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
si il n'est pas défini"""
return
self
.
shell
or
OptionalUser
.
get_cached_value
(
'shell_default'
)
@
cached_property
def
get_shadow_expire
(
self
):
"""Return the shadow_expire value for the user"""
if
self
.
state
==
self
.
STATE_DISABLED
:
return
str
(
0
)
else
:
return
None
def
end_adhesion
(
self
):
""" Renvoie la date de fin d'adhésion d'un user. Examine les objets
cotisation"""
...
...
@@ -522,10 +530,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
user_ldap
.
sambat_nt_password
=
self
.
pwd_ntlm
.
upper
()
if
self
.
get_shell
:
user_ldap
.
login_shell
=
str
(
self
.
get_shell
)
if
self
.
state
==
self
.
STATE_DISABLED
:
user_ldap
.
shadowexpire
=
str
(
0
)
else
:
user_ldap
.
shadowexpire
=
None
user_ldap
.
shadowexpire
=
self
.
get_shadow_expire
if
access_refresh
:
user_ldap
.
dialupAccess
=
str
(
self
.
has_access
())
if
mac_refresh
:
...
...
Write
Preview
Supports
Markdown
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