Revision 8a8578c5 snf-astakos-app/astakos/im/views.py
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
78 | 78 |
AstakosUser, ApprovalTerms, |
79 | 79 |
EmailChange, RESOURCE_SEPARATOR, |
80 | 80 |
AstakosUserAuthProvider, PendingThirdPartyUser, |
81 |
PendingMembershipError, |
|
81 | 82 |
ProjectApplication, ProjectMembership, Project) |
82 | 83 |
from astakos.im.util import ( |
83 | 84 |
get_context, prepare_response, get_query, restrict_next) |
... | ... | |
111 | 112 |
from astakos.im.api.callpoint import AstakosCallpoint |
112 | 113 |
from astakos.im import auth_providers |
113 | 114 |
from astakos.im.project_xctx import project_transaction_context |
115 |
from astakos.im.retry_xctx import RetryException |
|
114 | 116 |
|
115 | 117 |
logger = logging.getLogger(__name__) |
116 | 118 |
|
... | ... | |
1361 | 1363 |
leave_project(chain_id, request.user) |
1362 | 1364 |
except (IOError, PermissionDenied), e: |
1363 | 1365 |
messages.error(request, e) |
1366 |
except PendingMembershipError as e: |
|
1367 |
raise RetryException() |
|
1364 | 1368 |
except BaseException, e: |
1365 | 1369 |
logger.exception(e) |
1366 | 1370 |
messages.error(request, _(astakos_messages.GENERIC_ERROR)) |
... | ... | |
1383 | 1387 |
cancel_membership(chain_id, request.user) |
1384 | 1388 |
except (IOError, PermissionDenied), e: |
1385 | 1389 |
messages.error(request, e) |
1390 |
except PendingMembershipError as e: |
|
1391 |
raise RetryException() |
|
1386 | 1392 |
except BaseException, e: |
1387 | 1393 |
logger.exception(e) |
1388 | 1394 |
messages.error(request, _(astakos_messages.GENERIC_ERROR)) |
... | ... | |
1403 | 1409 |
m = accept_membership(chain_id, user_id, request.user) |
1404 | 1410 |
except (IOError, PermissionDenied), e: |
1405 | 1411 |
messages.error(request, e) |
1412 |
except PendingMembershipError as e: |
|
1413 |
raise RetryException() |
|
1406 | 1414 |
except BaseException, e: |
1407 | 1415 |
logger.exception(e) |
1408 | 1416 |
messages.error(request, _(astakos_messages.GENERIC_ERROR)) |
... | ... | |
1425 | 1433 |
m = remove_membership(chain_id, user_id, request.user) |
1426 | 1434 |
except (IOError, PermissionDenied), e: |
1427 | 1435 |
messages.error(request, e) |
1436 |
except PendingMembershipError as e: |
|
1437 |
raise RetryException() |
|
1428 | 1438 |
except BaseException, e: |
1429 | 1439 |
logger.exception(e) |
1430 | 1440 |
messages.error(request, _(astakos_messages.GENERIC_ERROR)) |
... | ... | |
1447 | 1457 |
m = reject_membership(chain_id, user_id, request.user) |
1448 | 1458 |
except (IOError, PermissionDenied), e: |
1449 | 1459 |
messages.error(request, e) |
1460 |
except PendingMembershipError as e: |
|
1461 |
raise RetryException() |
|
1450 | 1462 |
except BaseException, e: |
1451 | 1463 |
logger.exception(e) |
1452 | 1464 |
messages.error(request, _(astakos_messages.GENERIC_ERROR)) |
Also available in: Unified diff