Revision 7f3c4920 snf-astakos-app/astakos/im/views.py

b/snf-astakos-app/astakos/im/views.py
1500 1500

  
1501 1501
@require_http_methods(["POST"])
1502 1502
@valid_astakos_user_required
1503
def project_accept_member(request, chain_id, user_id):
1503
def project_accept_member(request, chain_id, memb_id):
1504 1504

  
1505 1505
    with ExceptionHandler(request):
1506
        _project_accept_member(request, chain_id, user_id)
1506
        _project_accept_member(request, chain_id, memb_id)
1507 1507

  
1508 1508
    return redirect(reverse('project_detail', args=(chain_id,)))
1509 1509

  
1510 1510

  
1511 1511
@commit_on_success_strict()
1512
def _project_accept_member(request, chain_id, user_id):
1512
def _project_accept_member(request, chain_id, memb_id):
1513 1513
    try:
1514 1514
        chain_id = int(chain_id)
1515
        user_id = int(user_id)
1516
        m = accept_membership(chain_id, user_id, request.user)
1515
        memb_id = int(memb_id)
1516
        m = accept_membership(chain_id, memb_id, request.user)
1517 1517
    except (IOError, PermissionDenied), e:
1518 1518
        messages.error(request, e)
1519 1519
    else:
......
1524 1524

  
1525 1525
@require_http_methods(["POST"])
1526 1526
@valid_astakos_user_required
1527
def project_remove_member(request, chain_id, user_id):
1527
def project_remove_member(request, chain_id, memb_id):
1528 1528

  
1529 1529
    with ExceptionHandler(request):
1530
        _project_remove_member(request, chain_id, user_id)
1530
        _project_remove_member(request, chain_id, memb_id)
1531 1531

  
1532 1532
    return redirect(reverse('project_detail', args=(chain_id,)))
1533 1533

  
1534 1534

  
1535 1535
@commit_on_success_strict()
1536
def _project_remove_member(request, chain_id, user_id):
1536
def _project_remove_member(request, chain_id, memb_id):
1537 1537
    try:
1538 1538
        chain_id = int(chain_id)
1539
        user_id = int(user_id)
1540
        m = remove_membership(chain_id, user_id, request.user)
1539
        memb_id = int(memb_id)
1540
        m = remove_membership(chain_id, memb_id, request.user)
1541 1541
    except (IOError, PermissionDenied), e:
1542 1542
        messages.error(request, e)
1543 1543
    else:
......
1548 1548

  
1549 1549
@require_http_methods(["POST"])
1550 1550
@valid_astakos_user_required
1551
def project_reject_member(request, chain_id, user_id):
1551
def project_reject_member(request, chain_id, memb_id):
1552 1552

  
1553 1553
    with ExceptionHandler(request):
1554
        _project_reject_member(request, chain_id, user_id)
1554
        _project_reject_member(request, chain_id, memb_id)
1555 1555

  
1556 1556
    return redirect(reverse('project_detail', args=(chain_id,)))
1557 1557

  
1558 1558

  
1559 1559
@commit_on_success_strict()
1560
def _project_reject_member(request, chain_id, user_id):
1560
def _project_reject_member(request, chain_id, memb_id):
1561 1561
    try:
1562 1562
        chain_id = int(chain_id)
1563
        user_id = int(user_id)
1564
        m = reject_membership(chain_id, user_id, request.user)
1563
        memb_id = int(memb_id)
1564
        m = reject_membership(chain_id, memb_id, request.user)
1565 1565
    except (IOError, PermissionDenied), e:
1566 1566
        messages.error(request, e)
1567 1567
    else:

Also available in: Unified diff