Revision b8f05f8d snf-astakos-app/astakos/im/views.py

b/snf-astakos-app/astakos/im/views.py
99 99
)
100 100
#from astakos.im.tasks import request_billing
101 101
from astakos.im.api.callpoint import AstakosCallpoint
102
from astakos.im.notifications import NotificationError
103 102

  
104 103
import astakos.im.messages as astakos_messages
105 104
from astakos.im import settings
......
1479 1478
            extra_context=extra_context, post_save_redirect='/im/project/list/',
1480 1479
            form_class=ProjectApplicationForm)
1481 1480
        return r
1482
    except NotificationError, e:
1481
    except BaseException, e:
1482
        logger.exception(e)
1483
        messages.error(request, _(astakos_messages.GENERIC_ERROR))
1483 1484
        rollback = True
1484
        messages.error(request, e.message)
1485 1485
        return render_response(
1486 1486
            'im/projects/projectapplication_form.html',
1487 1487
            sorting = 'definition__name',
......
1665 1665
        messages.error(request, msg)
1666 1666
    except PermissionDenied, e:
1667 1667
        messages.error(request, e)
1668
    except NotificationError, e:
1668
    except BaseException, e:
1669
        logger.exception(e)
1670
        messages.error(request, _(astakos_messages.GENERIC_ERROR))
1669 1671
        rollback = True
1670
        messages.error(request, e)
1671 1672
    else:
1672 1673
        return project_detail(request, id)
1673 1674
    finally:
......
1698 1699
        else:
1699 1700
            try:
1700 1701
                func(request, m)
1701
            except (NotificationError, PermissionDenied), e:
1702
            except PermissionDenied, e:
1702 1703
                messages.error(request, e)
1704
            except BaseException, e:
1705
                logger.exception(e)
1706
                messages.error(_(astakos_messages.GENERIC_ERROR ))
1703 1707
                rollback = True
1704 1708
        finally:
1705 1709
            if rollback:

Also available in: Unified diff