added proper aliases support
This commit is contained in:
parent
3e6e140e99
commit
93e3809e9b
1 changed files with 4 additions and 3 deletions
|
@ -363,7 +363,7 @@ class MakeShellAccounts(BaseClient):
|
||||||
memberships[group['name']] = []
|
memberships[group['name']] = []
|
||||||
try:
|
try:
|
||||||
for member in request['memberships'][u'%s' % group['id']]:
|
for member in request['memberships'][u'%s' % group['id']]:
|
||||||
memberships[group['name']].append({'person_id': member})
|
memberships[group['name']].append(member)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
self.memberships = memberships
|
self.memberships = memberships
|
||||||
|
@ -456,6 +456,8 @@ class MakeShellAccounts(BaseClient):
|
||||||
''' update your mail aliases file '''
|
''' update your mail aliases file '''
|
||||||
if not self.groups:
|
if not self.groups:
|
||||||
groups = self.group_list()
|
groups = self.group_list()
|
||||||
|
if not self.usernames:
|
||||||
|
self.get_usernames()
|
||||||
|
|
||||||
self.emails = self.email_list()
|
self.emails = self.email_list()
|
||||||
email_file = codecs.open(self.temp + '/aliases', mode='w', encoding='utf-8')
|
email_file = codecs.open(self.temp + '/aliases', mode='w', encoding='utf-8')
|
||||||
|
@ -467,14 +469,13 @@ class MakeShellAccounts(BaseClient):
|
||||||
sorted.sort()
|
sorted.sort()
|
||||||
for person in sorted:
|
for person in sorted:
|
||||||
email_file.write("%s: %s\n" % (person, self.emails[person]))
|
email_file.write("%s: %s\n" % (person, self.emails[person]))
|
||||||
usernames = self.usernames
|
|
||||||
for group in self.groups:
|
for group in self.groups:
|
||||||
name = group['name']
|
name = group['name']
|
||||||
members = {}
|
members = {}
|
||||||
members['member'] = []
|
members['member'] = []
|
||||||
for membership in self.memberships[name]:
|
for membership in self.memberships[name]:
|
||||||
role_type = membership['role_type']
|
role_type = membership['role_type']
|
||||||
person = usernames[membership['person_id']]
|
person = self.usernames[membership['person_id']]
|
||||||
if role_type == 'user':
|
if role_type == 'user':
|
||||||
''' Legacy support '''
|
''' Legacy support '''
|
||||||
members['member'].append(person)
|
members['member'].append(person)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue