equal
deleted
inserted
replaced
348 |
348 |
349 @has_global_perm('can_manage_workspace') |
349 @has_global_perm('can_manage_workspace') |
350 def user_suspend(request, key): |
350 def user_suspend(request, key): |
351 if request.method == 'POST': |
351 if request.method == 'POST': |
352 profile = get_object_or_404(UserProfile, key=key) |
352 profile = get_object_or_404(UserProfile, key=key) |
353 profile = UserProfile.objects.get(key=key) |
|
354 profile.is_suspended = True |
353 profile.is_suspended = True |
355 profile.save() |
354 profile.save() |
356 if profile.user.is_active: |
355 if profile.user.is_active: |
357 display_message(request, _(u"User's access %(prof)s has been suspended.") % {'prof':profile.simple_print()}) |
356 display_message(request, _(u"User's access %(prof)s has been suspended.") % {'prof':profile.simple_print()}) |
358 register_activity(request, "user_suspended", user=profile.user) |
357 register_activity(request, "user_suspended", user=profile.user) |
367 |
366 |
368 @has_global_perm('can_manage_workspace') |
367 @has_global_perm('can_manage_workspace') |
369 def user_enable(request, key): |
368 def user_enable(request, key): |
370 if request.method == 'POST': |
369 if request.method == 'POST': |
371 profile = get_object_or_404(UserProfile, key=key) |
370 profile = get_object_or_404(UserProfile, key=key) |
372 profile = UserProfile.objects.get(key=key) |
|
373 profile.is_suspended = False |
371 profile.is_suspended = False |
374 profile.save() |
372 profile.save() |
375 if profile.user.is_active: |
373 if profile.user.is_active: |
376 display_message(request, _(u"User's access %(prof)s has been restored.") % {'prof':profile.simple_print()}) |
374 display_message(request, _(u"User's access %(prof)s has been restored.") % {'prof':profile.simple_print()}) |
377 register_activity(request, "user_enabled", user=profile.user) |
375 register_activity(request, "user_enabled", user=profile.user) |
419 |
417 |
420 # override manually |
418 # override manually |
421 role_field = self.fields['role'] |
419 role_field = self.fields['role'] |
422 role_field.required = False |
420 role_field.required = False |
423 role_field.choices = [(u'', u'---------')] + [(r.id, str(r)) for r in Role.objects.filter(anon=True)] # limit anon choices |
421 role_field.choices = [(u'', u'---------')] + [(r.id, str(r)) for r in Role.objects.filter(anon=True)] # limit anon choices |
424 for c in role_field.choices: |
|
425 print c |
|
426 |
422 |
427 self.fields['role'] = role_field |
423 self.fields['role'] = role_field |
428 |
424 |
429 @has_global_perm('can_manage_workspace') |
425 @has_global_perm('can_manage_workspace') |
430 def user_anon_edit(request): |
426 def user_anon_edit(request): |
442 'title' : 'Edit anonymous user', |
438 'title' : 'Edit anonymous user', |
443 }, context_instance=RequestContext(request)) |
439 }, context_instance=RequestContext(request)) |
444 |
440 |
445 @has_global_perm('can_manage_workspace') |
441 @has_global_perm('can_manage_workspace') |
446 def user_edit(request, key): |
442 def user_edit(request, key): |
447 profile = UserProfile.objects.get(key=key) |
443 profile = get_object_or_404(UserProfile, key=key) |
448 user = profile.user |
444 user = profile.user |
449 userrole = profile.global_userrole() |
445 userrole = profile.global_userrole() |
450 if request.method == 'POST': |
446 if request.method == 'POST': |
451 userform = UserForm(request.POST, instance=user) |
447 userform = UserForm(request.POST, instance=user) |
452 userprofileform = UserProfileForm(request.POST, instance=profile) |
448 userprofileform = UserProfileForm(request.POST, instance=profile) |
479 widget=forms.Textarea, |
475 widget=forms.Textarea, |
480 required=True) |
476 required=True) |
481 |
477 |
482 @login_required |
478 @login_required |
483 def user_contact(request, key): |
479 def user_contact(request, key): |
484 recipient_profile = UserProfile.objects.get(key=key) |
480 recipient_profile = get_object_or_404(UserProfile, key=key) |
485 |
481 |
486 if request.method == 'POST': |
482 if request.method == 'POST': |
487 contact_form = UserContactForm(request.POST) |
483 contact_form = UserContactForm(request.POST) |
488 if contact_form.is_valid(): |
484 if contact_form.is_valid(): |
489 data = contact_form.cleaned_data |
485 data = contact_form.cleaned_data |