equal
deleted
inserted
replaced
324 else: |
324 else: |
325 user.username = '' |
325 user.username = '' |
326 userform = UserValidateForm(instance=user) |
326 userform = UserValidateForm(instance=user) |
327 pwform = SetPasswordForm(user) |
327 pwform = SetPasswordForm(user) |
328 |
328 |
|
329 cache.clear() |
329 return render_to_response('site/activate.html', { |
330 return render_to_response('site/activate.html', { |
330 'forms' : [userform, pwform], |
331 'forms' : [userform, pwform], |
331 'title': _(u'Activate your account'), |
332 'title': _(u'Activate your account'), |
332 'save_name' : _(u'activate account'), |
333 'save_name' : _(u'activate account'), |
333 }, context_instance=RequestContext(request)) |
334 }, context_instance=RequestContext(request)) |
365 # make use active but disabled |
366 # make use active but disabled |
366 profile.user.is_active = True |
367 profile.user.is_active = True |
367 profile.user.save() |
368 profile.user.save() |
368 display_message(request, _(u"User's access %(prof)s has been refused.") % {'prof':profile.simple_print()}) |
369 display_message(request, _(u"User's access %(prof)s has been refused.") % {'prof':profile.simple_print()}) |
369 register_activity(request, "user_refused", user=profile.user) |
370 register_activity(request, "user_refused", user=profile.user) |
|
371 cache.clear() |
370 return HttpResponse('') # no redirect because this is called by js |
372 return HttpResponse('') # no redirect because this is called by js |
371 raise UnauthorizedException('') |
373 raise UnauthorizedException('') |
372 |
374 |
373 @has_global_perm('can_manage_workspace') |
375 @has_global_perm('can_manage_workspace') |
374 def user_enable(request, key): |
376 def user_enable(request, key): |