Revision 84a3f701 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
66 | 66 |
from astakos.im.notifications import build_notification, NotificationError |
67 | 67 |
from astakos.im.models import ( |
68 | 68 |
AstakosUser, ProjectMembership, ProjectApplication, Project, |
69 |
trigger_sync, PendingMembershipError, get_resource_names)
|
|
69 |
sync_projects, PendingMembershipError, get_resource_names)
|
|
70 | 70 |
from astakos.im.models import submit_application as models_submit_application |
71 | 71 |
from astakos.im.project_notif import ( |
72 | 72 |
membership_change_notify, |
73 | 73 |
application_submit_notify, application_approve_notify, |
74 | 74 |
application_deny_notify, |
75 | 75 |
project_termination_notify, project_suspension_notify) |
76 |
from astakos.im.endpoints.qh import qh_register_user, qh_get_quota |
|
76 |
from astakos.im.endpoints.qh import qh_register_user_with_quotas, qh_get_quota
|
|
77 | 77 |
|
78 | 78 |
import astakos.im.messages as astakos_messages |
79 | 79 |
|
... | ... | |
299 | 299 |
if not user.activation_sent: |
300 | 300 |
user.activation_sent = datetime.now() |
301 | 301 |
user.save() |
302 |
qh_register_user(user) |
|
302 |
qh_register_user_with_quotas(user)
|
|
303 | 303 |
send_helpdesk_notification(user, helpdesk_email_template_name) |
304 | 304 |
send_greeting(user, email_template_name) |
305 | 305 |
|
... | ... | |
377 | 377 |
super(SendNotificationError, self).__init__() |
378 | 378 |
|
379 | 379 |
|
380 |
def get_quota(user): |
|
380 |
def get_quota(users):
|
|
381 | 381 |
resources = get_resource_names() |
382 |
return qh_get_quota(user, resources) |
|
382 |
return qh_get_quota(users, resources)
|
|
383 | 383 |
|
384 | 384 |
|
385 | 385 |
### PROJECT VIEWS ### |
... | ... | |
507 | 507 |
|
508 | 508 |
membership = get_membership_for_update(project, user) |
509 | 509 |
membership.accept() |
510 |
trigger_sync()
|
|
510 |
sync_projects()
|
|
511 | 511 |
|
512 | 512 |
membership_change_notify(project, membership.person, 'accepted') |
513 | 513 |
|
... | ... | |
560 | 560 |
|
561 | 561 |
membership = get_membership_for_update(project, user) |
562 | 562 |
membership.remove() |
563 |
trigger_sync()
|
|
563 |
sync_projects()
|
|
564 | 564 |
|
565 | 565 |
membership_change_notify(project, membership.person, 'removed') |
566 | 566 |
|
... | ... | |
576 | 576 |
|
577 | 577 |
membership = create_membership(project_id, user) |
578 | 578 |
membership.accept() |
579 |
trigger_sync()
|
|
579 |
sync_projects()
|
|
580 | 580 |
|
581 | 581 |
# TODO send proper notification |
582 | 582 |
return membership |
... | ... | |
606 | 606 |
leave_policy = project.application.member_leave_policy |
607 | 607 |
if leave_policy == AUTO_ACCEPT_POLICY: |
608 | 608 |
membership.remove() |
609 |
trigger_sync()
|
|
609 |
sync_projects()
|
|
610 | 610 |
else: |
611 | 611 |
membership.leave_request_date = datetime.now() |
612 | 612 |
membership.save() |
... | ... | |
638 | 638 |
if (join_policy == AUTO_ACCEPT_POLICY and |
639 | 639 |
not project.violates_members_limit(adding=1)): |
640 | 640 |
membership.accept() |
641 |
trigger_sync()
|
|
641 |
sync_projects()
|
|
642 | 642 |
return membership |
643 | 643 |
|
644 | 644 |
def submit_application(kw, request_user=None): |
... | ... | |
698 | 698 |
raise PermissionDenied() |
699 | 699 |
|
700 | 700 |
application.approve() |
701 |
trigger_sync()
|
|
701 |
sync_projects()
|
|
702 | 702 |
|
703 | 703 |
application_approve_notify(application) |
704 | 704 |
|
... | ... | |
716 | 716 |
checkAlive(project) |
717 | 717 |
|
718 | 718 |
project.terminate() |
719 |
trigger_sync()
|
|
719 |
sync_projects()
|
|
720 | 720 |
|
721 | 721 |
project_termination_notify(project) |
722 | 722 |
|
... | ... | |
725 | 725 |
checkAlive(project) |
726 | 726 |
|
727 | 727 |
project.suspend() |
728 |
trigger_sync()
|
|
728 |
sync_projects()
|
|
729 | 729 |
|
730 | 730 |
project_suspension_notify(project) |
731 | 731 |
|
... | ... | |
737 | 737 |
raise PermissionDenied(m) |
738 | 738 |
|
739 | 739 |
project.resume() |
740 |
trigger_sync() |
|
740 |
sync_projects() |
Also available in: Unified diff