Revision e1723ca1
| b/snf-astakos-app/astakos/im/functions.py | ||
|---|---|---|
| 573 | 573 |
except IOError: |
| 574 | 574 |
membership = new_membership(project, request_user) |
| 575 | 575 |
|
| 576 |
auto_accepted = False |
|
| 577 | 576 |
join_policy = project.application.member_join_policy |
| 578 | 577 |
if (join_policy == AUTO_ACCEPT_POLICY and ( |
| 579 | 578 |
not project.violates_members_limit(adding=1))): |
| ... | ... | |
| 581 | 580 |
qh_sync_user(request_user) |
| 582 | 581 |
logger.info("User %s joined %s." %
|
| 583 | 582 |
(request_user.log_display, project)) |
| 584 |
auto_accepted = True |
|
| 585 | 583 |
else: |
| 586 | 584 |
membership_request_notify(project, membership.person) |
| 587 | 585 |
logger.info("User %s requested to join %s." %
|
| 588 | 586 |
(request_user.log_display, project)) |
| 589 |
return auto_accepted
|
|
| 587 |
return membership
|
|
| 590 | 588 |
|
| 591 | 589 |
|
| 592 | 590 |
MEMBERSHIP_ACTION_CHECKS = {
|
| b/snf-astakos-app/astakos/im/views/projects.py | ||
|---|---|---|
| 452 | 452 |
def _project_join(request, chain_id): |
| 453 | 453 |
try: |
| 454 | 454 |
chain_id = int(chain_id) |
| 455 |
auto_accepted = join_project(chain_id, request.user)
|
|
| 456 |
if auto_accepted:
|
|
| 455 |
membership = join_project(chain_id, request.user)
|
|
| 456 |
if membership.state != membership.REQUESTED:
|
|
| 457 | 457 |
m = _(astakos_messages.USER_JOINED_PROJECT) |
| 458 | 458 |
else: |
| 459 | 459 |
m = _(astakos_messages.USER_JOIN_REQUEST_SUBMITTED) |
Also available in: Unified diff