Revision 97896995 snf-astakos-app/astakos/im/views.py
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
1694 | 1694 |
def wrapper(request, id, user_id=None): |
1695 | 1695 |
rollback = False |
1696 | 1696 |
if not user_id: |
1697 |
user_id = user.id |
|
1697 |
user_id = request.user.id
|
|
1698 | 1698 |
try: |
1699 | 1699 |
m = ProjectMembership.objects.select_related().get( |
1700 | 1700 |
project__application__id=id, |
1701 | 1701 |
person__id=user_id) |
1702 | 1702 |
except AstakosUser.DoesNotExist: |
1703 |
return HttpResponseBadRequest(_(astakos_messages.ACCOUNT_UNKNOWN)) |
|
1703 |
msg = _(astakos_messages.ACCOUNT_UNKNOWN) |
|
1704 |
messages.error(request, msg) |
|
1704 | 1705 |
except ProjectMembership.DoesNotExist: |
1705 |
return HttpResponseBadRequest(_(astakos_messages.NOT_MEMBER)) |
|
1706 |
msg = _(astakos_messages.NOT_MEMBER) |
|
1707 |
messages.error(request, msg) |
|
1706 | 1708 |
else: |
1707 | 1709 |
try: |
1708 | 1710 |
func(request, m) |
... | ... | |
1718 | 1720 |
return wrapper |
1719 | 1721 |
|
1720 | 1722 |
|
1721 |
@require_http_methods(["GET"]) |
|
1723 |
@require_http_methods(["GET", "POST"])
|
|
1722 | 1724 |
@signed_terms_required |
1723 | 1725 |
@login_required |
1724 | 1726 |
@handle_project_membership |
... | ... | |
1732 | 1734 |
@handle_project_membership |
1733 | 1735 |
def project_approve_member(request, m): |
1734 | 1736 |
m.accept(request_user=request.user) |
1735 |
realname = membership.person.realname
|
|
1737 |
realname = m.person.realname |
|
1736 | 1738 |
msg = _(astakos_messages.USER_JOINED_GROUP) % locals() |
1737 | 1739 |
messages.success(request, msg) |
1738 | 1740 |
|
... | ... | |
1754 | 1756 |
@handle_project_membership |
1755 | 1757 |
def project_reject_member(request, m): |
1756 | 1758 |
m.remove(request_user=request.user) |
1757 |
realname = membership.person.realname
|
|
1759 |
realname = m.person.realname |
|
1758 | 1760 |
msg = _(astakos_messages.USER_MEMBERSHIP_REJECTED) % locals() |
1759 | 1761 |
messages.success(request, msg) |
Also available in: Unified diff