External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 13:27:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Revert previous fix for deleted name change, update how we change username when a user is marked inactive to keep it under 30 chars.

Browse Source
This commit is contained in:
Chris Church
2013-07-27 21:05:17 -04:00
parent de2cd7b0fc
commit 222bbd7c98
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/models/__init__.py
View File

@@ -98,18 +98,7 @@ class PrimordialModel(models.Model):
if self.active:
if 'name' in self._meta.get_all_field_names():
# 0 1
# 01234567890123
has_description = False
if 'description' in self._meta.get_all_field_names():
has_description = True
old_desc = ''
if has_description:
old_desc = self.description
self.description = "deleted: %s" % self.name
if old_desc:
self.description = "%s (%s)" % (self.description, old_desc)
self.name = "_d_%s" % (now().isoformat())
self.name = "_deleted_%s_%s" % (now().isoformat(), self.name)
self.active = False
if save:
self.save()
@@ -1247,7 +1236,10 @@ class JobEvent(models.Model):
def user_mark_inactive(user, save=True):
'''Use instead of delete to rename and mark users inactive.'''
if user.is_active:
user.username = "_deleted_%s_%s" % (now().isoformat(), user.username)
# Set timestamp to datetime.isoformat() but without the time zone
# offse to stay withint the 30 character username limit.
deleted_ts = now().strftime('%Y-%m-%dT%H:%M:%S.%f')
user.username = '_d_%s' % deleted_ts
user.is_active = False
if save:
user.save()