Revision 9e98ba3c admin/views.py
b/admin/views.py | ||
---|---|---|
6 | 6 |
|
7 | 7 |
from synnefo.db import models |
8 | 8 |
from synnefo.invitations.invitations import add_invitation, send_invitation |
9 |
from synnefo.logic import backend, log, users |
|
9 |
from synnefo.logic import backend, users |
|
10 |
from synnefo.util.log import getLogger |
|
10 | 11 |
|
11 | 12 |
|
12 |
_log = log.get_logger('synnefo.admin')
|
|
13 |
log = getLogger('synnefo.admin')
|
|
13 | 14 |
|
14 | 15 |
|
15 | 16 |
def render(template, tab, **kwargs): |
... | ... | |
69 | 70 |
flavor.ram = int(request.POST.get('ram')) |
70 | 71 |
flavor.disk = int(request.POST.get('disk')) |
71 | 72 |
flavor.save() |
72 |
_log.info('User %s created Flavor %s', request.user.name, flavor.name)
|
|
73 |
log.info('User %s created Flavor %s', request.user.name, flavor.name) |
|
73 | 74 |
return redirect(flavors_info, flavor.id) |
74 | 75 |
|
75 | 76 |
|
... | ... | |
87 | 88 |
flavor.ram = int(request.POST.get('ram')) |
88 | 89 |
flavor.disk = int(request.POST.get('disk')) |
89 | 90 |
flavor.save() |
90 |
_log.info('User %s modified Flavor %s', request.user.name, flavor.name)
|
|
91 |
log.info('User %s modified Flavor %s', request.user.name, flavor.name) |
|
91 | 92 |
return redirect(flavors_info, flavor.id) |
92 | 93 |
|
93 | 94 |
|
... | ... | |
95 | 96 |
def flavors_delete(request, flavor_id): |
96 | 97 |
flavor = models.Flavor.objects.get(id=flavor_id) |
97 | 98 |
flavor.delete() |
98 |
_log.info('User %s deleted Flavor %s', request.user.name, flavor.name)
|
|
99 |
log.info('User %s deleted Flavor %s', request.user.name, flavor.name) |
|
99 | 100 |
return redirect(flavors_list) |
100 | 101 |
|
101 | 102 |
|
... | ... | |
122 | 123 |
image.format = request.POST.get('format') |
123 | 124 |
image.public = True if request.POST.get('public') else False |
124 | 125 |
image.save() |
125 |
_log.info('User %s registered Image %s', request.user.name, image.name)
|
|
126 |
log.info('User %s registered Image %s', request.user.name, image.name) |
|
126 | 127 |
return redirect(images_info, image.id) |
127 | 128 |
|
128 | 129 |
|
... | ... | |
167 | 168 |
if key: |
168 | 169 |
image.metadata.create(meta_key=key, meta_value=val) |
169 | 170 |
|
170 |
_log.info('User %s modified Image %s', request.user.name, image.name)
|
|
171 |
log.info('User %s modified Image %s', request.user.name, image.name) |
|
171 | 172 |
|
172 | 173 |
return redirect(images_info, image.id) |
173 | 174 |
|
... | ... | |
198 | 199 |
inviter = models.SynnefoUser.objects.get(id=inviter_id) |
199 | 200 |
inv = add_invitation(inviter, realname, uniq) |
200 | 201 |
send_invitation(inv) |
201 |
_log.info('User %s sent Invitation to %s as %s', request.user.name,
|
|
202 |
log.info('User %s sent Invitation to %s as %s', request.user.name, |
|
202 | 203 |
uniq, inviter.name) |
203 | 204 |
return redirect(users_list) |
204 | 205 |
|
... | ... | |
224 | 225 |
invitations = request.POST.get('invitations') |
225 | 226 |
user.max_invitations = int(invitations) if invitations else None |
226 | 227 |
user.save() |
227 |
_log.info('User %s modified User %s', request.user.name, user.name)
|
|
228 |
log.info('User %s modified User %s', request.user.name, user.name) |
|
228 | 229 |
return redirect(users_info, user.id) |
229 | 230 |
|
230 | 231 |
|
... | ... | |
232 | 233 |
def users_delete(request, user_id): |
233 | 234 |
user = models.SynnefoUser.objects.get(id=user_id) |
234 | 235 |
users.delete_user(user) |
235 |
_log.info('User %s deleted User %s', request.user.name, user.name)
|
|
236 |
log.info('User %s deleted User %s', request.user.name, user.name) |
|
236 | 237 |
return redirect(users_list) |
237 | 238 |
|
238 | 239 |
|
... | ... | |
248 | 249 |
def invitations_resend(request, invitation_id): |
249 | 250 |
invitation = models.Invitations.objects.get(id=invitation_id) |
250 | 251 |
send_invitation(invitation) |
251 |
_log.info('User %s resent Invitations from %s to %s', request.user.name,
|
|
252 |
log.info('User %s resent Invitations from %s to %s', request.user.name, |
|
252 | 253 |
invitation.source.name, invitation.target.name) |
253 | 254 |
return redirect(invitations_list) |
Also available in: Unified diff