IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename user-lock and user-unlock to user-enable user-disable.

Browse Source 
Ticket #165
This commit is contained in:
Pavel Zuna 2010-10-05 15:37:37 -04:00 committed by Rob Crittenden
parent 9832780414
commit 6606b2a9c5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipalib/plugins/user.py
View File

@ -37,11 +37,11 @@ EXAMPLES:
Find all users with "Tim" as the first name:
ipa user-find --first=Tim
Lock a user account:
ipa user-lock tuser1
Disable a user account:
ipa user-disable tuser1
Unlock a user account:
ipa user-unlock tuser1
Enable a user account:
ipa user-enable tuser1
Delete a user:
ipa user-del tuser1
@ -274,13 +274,13 @@ class user_show(LDAPRetrieve):
api.register(user_show)
class user_lock(LDAPQuery):
class user_disable(LDAPQuery):
"""
Lock a user account.
Disable user account.
"""
has_output = output.standard_value
msg_summary = _('Locked user "%(value)s"')
msg_summary = _('Disabled user account "%(value)s"')
def execute(self, *keys, **options):
ldap = self.obj.backend
@ -297,16 +297,16 @@ class user_lock(LDAPQuery):
value=keys[0],
)
api.register(user_lock)
api.register(user_disable)
class user_unlock(LDAPQuery):
class user_enable(LDAPQuery):
"""
Unlock a user account.
Enable user account.
"""
has_output = output.standard_value
msg_summary = _('Unlocked user "%(value)s"')
msg_summary = _('Enabled user account "%(value)s"')
def execute(self, *keys, **options):
ldap = self.obj.backend
@ -323,4 +323,4 @@ class user_unlock(LDAPQuery):
value=keys[0],
)
api.register(user_unlock)
api.register(user_enable)

12
tests/test_xmlrpc/test_user_plugin.py
View File

@ -234,27 +234,27 @@ class test_user(Declarative):
dict(
desc='Lock %r' % user1,
desc='Disable %r' % user1,
command=(
'user_lock', [user1], {}
'user_disable', [user1], {}
),
expected=dict(
result=True,
value=user1,
summary=u'Locked user "tuser1"',
summary=u'Disabled user account "tuser1"',
),
),
dict(
desc='Unlock %r' % user1,
desc='Enable %r' % user1,
command=(
'user_unlock', [user1], {}
'user_enable', [user1], {}
),
expected=dict(
result=True,
value=user1,
summary=u'Unlocked user "tuser1"',
summary=u'Enabled user account "tuser1"',
),
),