Revision 24406ae3

b/snf-astakos-app/astakos/im/target/local.py
74 74
    elif not user.is_active:
75 75
        message = _('Inactive account')
76 76
    if message:
77
        messages.add_message(request, messages.ERROR, message)
77
        messages.error(request, message)
78 78
        return render_to_response(on_failure,
79 79
                                  {'form':form},
80 80
                                  context_instance=RequestContext(request))
b/snf-astakos-app/astakos/im/target/shibboleth.py
85 85
                                    'renew' in request.GET)
86 86
        else:
87 87
            message = _('Inactive account')
88
            messages.add_message(request, messages.ERROR, message)
88
            messages.error(request, message)
89 89
            return render_response(on_login_template,
90 90
                                   login_form = LoginForm(request=request),
91 91
                                   context_instance=RequestContext(request))
......
99 99
            form = backend.get_signup_form(provider='shibboleth', instance=user)
100 100
        except Exception, e:
101 101
            form = SimpleBackend(request).get_signup_form(provider='shibboleth', instance=user)
102
            messages.add_message(request, messages.ERROR, e)
102
            messages.error(request, e)
103 103
        return render_response(on_creation_template,
104 104
                               signup_form = form,
105 105
                               provider = 'shibboleth',
b/snf-astakos-app/astakos/im/views.py
192 192
                try:
193 193
                    invitation = form.save()
194 194
                    invite_func(invitation, inviter)
195
                    status = messages.SUCCESS
196 195
                    message = _('Invitation sent to %s' % invitation.username)
196
                    messages.success(request, message)
197 197
                except SendMailError, e:
198
                    status = messages.ERROR
199 198
                    message = e.message
199
                    messages.error(request, message)
200 200
                    transaction.rollback()
201 201
                except BaseException, e:
202
                    status = messages.ERROR
203 202
                    message = _('Something went wrong.')
203
                    messages.error(request, message)
204 204
                    logger.exception(e)
205 205
                    transaction.rollback()
206 206
                else:
207 207
                    transaction.commit()
208 208
        else:
209
            status = messages.ERROR
210 209
            message = _('No invitations left')
211
    messages.add_message(request, status, message)
210
            messages.error(request, message)
212 211

  
213 212
    sent = [{'email': inv.username,
214 213
             'realname': inv.realname,
......
267 266
                if next:
268 267
                    return redirect(next)
269 268
                msg = _('Profile has been updated successfully')
270
                messages.add_message(request, messages.SUCCESS, msg)
269
                messages.success(request, msg)
271 270
            except ValueError, ve:
272
                messages.add_message(request, messages.ERROR, ve)
271
                messages.success(request, ve)
273 272
    elif request.method == "GET":
274 273
        request.user.is_verified = True
275 274
        request.user.save()
......
324 323
        form = backend.get_signup_form(provider)
325 324
    except Exception, e:
326 325
        form = SimpleBackend(request).get_signup_form(provider)
327
        messages.add_message(request, messages.ERROR, e)
326
        messages.error(request, e)
328 327
    if request.method == 'POST':
329 328
        if form.is_valid():
330 329
            user = form.save(commit=False)
......
346 345
                return render_response(on_success,
347 346
                                       context_instance=get_context(request, extra_context))
348 347
            except SendMailError, e:
349
                status = messages.ERROR
350 348
                message = e.message
351
                messages.add_message(request, status, message)
349
                messages.error(request, message)
352 350
            except BaseException, e:
353
                status = messages.ERROR
354 351
                message = _('Something went wrong.')
355
                messages.add_message(request, status, message)
352
                messages.error(request, message)
356 353
                logger.exception(e)
357 354
    return render_response(template_name,
358 355
                           signup_form = form,
......
401 398
            try:
402 399
                send_feedback(msg, data, request.user, email_template_name)
403 400
            except SendMailError, e:
404
                message = e.message
405 401
                status = messages.ERROR
402
                messages.error(request, message)
406 403
            else:
407 404
                message = _('Feedback successfully sent')
408
                status = messages.SUCCESS
409
            messages.add_message(request, status, message)
405
                messages.succeess(request, message)
410 406
    return render_response(template_name,
411 407
                           feedback_form = form,
412 408
                           context_instance = get_context(request, extra_context))
......
432 428
        response['Location'] = LOGOUT_NEXT
433 429
        response.status_code = 301
434 430
        return response
435
    messages.add_message(request, messages.SUCCESS, _('You have successfully logged out.'))
431
    messages.success(request, _('You have successfully logged out.'))
436 432
    context = get_context(request, extra_context)
437 433
    response.write(render_to_string(template, context_instance=context))
438 434
    return response
......
455 451
    
456 452
    if user.is_active:
457 453
        message = _('Account already active.')
458
        messages.add_message(request, messages.ERROR, message)
454
        messages.error(request, message)
459 455
        return index(request)
460 456
        
461 457
    try:
......
468 464
            return response
469 465
        except SendMailError, e:
470 466
            message = e.message
471
            messages.add_message(request, messages.ERROR, message)
467
            messages.error(request, message)
472 468
            transaction.rollback()
473 469
            return index(request)
474 470
        except BaseException, e:
475
            status = messages.ERROR
476 471
            message = _('Something went wrong.')
477
            messages.add_message(request, messages.ERROR, message)
472
            messages.error(request, message)
478 473
            logger.exception(e)
479 474
            transaction.rollback()
480 475
            return index(request)
......
486 481
            return response
487 482
        except SendMailError, e:
488 483
            message = e.message
489
            messages.add_message(request, messages.ERROR, message)
484
            messages.error(request, message)
490 485
            transaction.rollback()
491 486
            return index(request)
492 487
        except BaseException, e:
493
            status = messages.ERROR
494 488
            message = _('Something went wrong.')
495
            messages.add_message(request, messages.ERROR, message)
489
            messages.error(request, message)
496 490
            logger.exception(e)
497 491
            transaction.rollback()
498 492
            return index(request)
......
556 550
            user = EmailChange.objects.change_email(activation_key)
557 551
            if request.user.is_authenticated() and request.user == user:
558 552
                msg = _('Email changed successfully.')
559
                messages.add_message(request, messages.SUCCESS, msg)
553
                messages.success(request, msg)
560 554
                auth_logout(request)
561 555
                response = prepare_response(request, user)
562 556
                transaction.commit()
563 557
                return response
564 558
        except ValueError, e:
565
            messages.add_message(request, messages.ERROR, e)
559
            messages.error(request, e)
566 560
        return render_response(confirm_template_name,
567 561
                               modified_user = user if 'user' in locals() else None,
568 562
                               context_instance = get_context(request,
......
577 571
        try:
578 572
            ec = form.save(email_template_name, request)
579 573
        except SendMailError, e:
580
            status = messages.ERROR
581 574
            msg = e
575
            messages.error(request, msg)
582 576
            transaction.rollback()
583 577
        except IntegrityError, e:
584
            status = messages.ERROR
585 578
            msg = _('There is already a pending change email request.')
579
            messages.error(request, msg)
586 580
        else:
587
            status = messages.SUCCESS
588 581
            msg = _('Change email request has been registered succefully.\
589 582
                    You are going to receive a verification email in the new address.')
583
            messages.success(request, msg)
590 584
            transaction.commit()
591
        messages.add_message(request, status, msg)
592 585
    return render_response(form_template_name,
593 586
                           form = form,
594 587
                           context_instance = get_context(request,

Also available in: Unified diff