Revision 2556cf45 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
280 | 280 |
|
281 | 281 |
def get_project_by_id(project_id): |
282 | 282 |
try: |
283 |
return Project.objects.get(id=project_id) |
|
283 |
return Project.objects.select_related( |
|
284 |
"application", "application__owner", |
|
285 |
"application__applicant").get(id=project_id) |
|
284 | 286 |
except Project.DoesNotExist: |
285 | 287 |
m = _(astakos_messages.UNKNOWN_PROJECT_ID) % project_id |
286 | 288 |
raise ProjectNotFound(m) |
... | ... | |
500 | 502 |
return membership |
501 | 503 |
|
502 | 504 |
|
505 |
def enroll_member_by_email(project_id, email, request_user=None, reason=None): |
|
506 |
try: |
|
507 |
user = AstakosUser.objects.verified().get(email=email) |
|
508 |
return enroll_member(project_id, user, request_user, reason=reason) |
|
509 |
except AstakosUser.DoesNotExist: |
|
510 |
raise ProjectConflict(astakos_messages.UNKNOWN_USERS) |
|
511 |
|
|
512 |
|
|
503 | 513 |
def enroll_member(project_id, user, request_user=None, reason=None): |
504 | 514 |
project = get_project_for_update(project_id) |
505 | 515 |
try: |
Also available in: Unified diff