Revision bb6a4465 snf-astakos-app/astakos/im/functions.py

b/snf-astakos-app/astakos/im/functions.py
70 70
    PendingMembershipError, get_resource_names, new_chain)
71 71
from astakos.im.project_notif import (
72 72
    membership_change_notify, membership_enroll_notify,
73
    membership_request_notify, membership_leave_request_notify,
73 74
    application_submit_notify, application_approve_notify,
74 75
    application_deny_notify,
75 76
    project_termination_notify, project_suspension_notify)
......
615 616
        m = _(astakos_messages.NOT_ACCEPTED_MEMBERSHIP)
616 617
        raise PermissionDenied(m)
617 618

  
619
    auto_accepted = False
618 620
    leave_policy = project.application.member_leave_policy
619 621
    if leave_policy == AUTO_ACCEPT_POLICY:
620 622
        membership.remove()
623
        auto_accepted = True
621 624
    else:
622 625
        membership.leave_request_date = datetime.now()
623 626
        membership.save()
624
    return membership
627
        membership_leave_request_notify(project, membership.person)
628
    return auto_accepted
625 629

  
626 630
def join_project_checks(project):
627 631
    checkAlive(project)
......
644 648
    join_project_checks(project)
645 649
    membership = create_membership(project, user_id)
646 650

  
651
    auto_accepted = False
647 652
    join_policy = project.application.member_join_policy
648 653
    if (join_policy == AUTO_ACCEPT_POLICY and
649 654
        not project.violates_members_limit(adding=1)):
650 655
        membership.accept()
651
    return membership
656
        auto_accepted = True
657
    else:
658
        membership_request_notify(project, membership.person)
659

  
660
    return auto_accepted
652 661

  
653 662
def submit_application(kw, request_user=None):
654 663

  

Also available in: Unified diff