Revision 88beea39 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
769 | 769 |
|
770 | 770 |
qh_release_pending_app(application.owner) |
771 | 771 |
|
772 |
application.cancel() |
|
772 |
application.cancel(actor=request_user, reason=reason)
|
|
773 | 773 |
logger.info("%s has been cancelled." % (application.log_display)) |
774 | 774 |
|
775 | 775 |
|
... | ... | |
783 | 783 |
(application.id, application.state_display())) |
784 | 784 |
raise ProjectConflict(m) |
785 | 785 |
|
786 |
application.dismiss() |
|
786 |
application.dismiss(actor=request_user, reason=reason)
|
|
787 | 787 |
logger.info("%s has been dismissed." % (application.log_display)) |
788 | 788 |
|
789 | 789 |
|
... | ... | |
800 | 800 |
|
801 | 801 |
qh_release_pending_app(application.owner) |
802 | 802 |
|
803 |
application.deny(reason) |
|
803 |
application.deny(actor=request_user, reason=reason)
|
|
804 | 804 |
logger.info("%s has been denied with reason \"%s\"." % |
805 | 805 |
(application.log_display, reason)) |
806 | 806 |
application_deny_notify(application) |
... | ... | |
843 | 843 |
get_users_for_update(uids_to_sync) |
844 | 844 |
|
845 | 845 |
qh_release_pending_app(owner, locked=True) |
846 |
application.approve(reason) |
|
846 |
application.approve(actor=request_user, reason=reason)
|
|
847 | 847 |
project.application = application |
848 | 848 |
project.name = application.name |
849 | 849 |
project.save() |
... | ... | |
864 | 864 |
return [project.expiration_info() for project in expired] |
865 | 865 |
|
866 | 866 |
|
867 |
def terminate(project_id, request_user=None): |
|
867 |
def terminate(project_id, request_user=None, reason=None):
|
|
868 | 868 |
project = get_project_for_update(project_id) |
869 | 869 |
project_check_allowed(project, request_user, level=ADMIN_LEVEL) |
870 | 870 |
checkAlive(project) |
871 | 871 |
|
872 |
project.terminate() |
|
872 |
project.terminate(actor=request_user, reason=reason)
|
|
873 | 873 |
qh_sync_project(project) |
874 | 874 |
logger.info("%s has been terminated." % (project)) |
875 | 875 |
|
876 | 876 |
project_termination_notify(project) |
877 | 877 |
|
878 | 878 |
|
879 |
def suspend(project_id, request_user=None): |
|
879 |
def suspend(project_id, request_user=None, reason=None):
|
|
880 | 880 |
project = get_project_for_update(project_id) |
881 | 881 |
project_check_allowed(project, request_user, level=ADMIN_LEVEL) |
882 | 882 |
checkAlive(project) |
883 | 883 |
|
884 |
project.suspend() |
|
884 |
project.suspend(actor=request_user, reason=reason)
|
|
885 | 885 |
qh_sync_project(project) |
886 | 886 |
logger.info("%s has been suspended." % (project)) |
887 | 887 |
|
888 | 888 |
project_suspension_notify(project) |
889 | 889 |
|
890 | 890 |
|
891 |
def resume(project_id, request_user=None): |
|
891 |
def resume(project_id, request_user=None, reason=None):
|
|
892 | 892 |
project = get_project_for_update(project_id) |
893 | 893 |
project_check_allowed(project, request_user, level=ADMIN_LEVEL) |
894 | 894 |
|
... | ... | |
896 | 896 |
m = _(astakos_messages.NOT_SUSPENDED_PROJECT) % project.id |
897 | 897 |
raise ProjectConflict(m) |
898 | 898 |
|
899 |
project.resume() |
|
899 |
project.resume(actor=request_user, reason=reason)
|
|
900 | 900 |
qh_sync_project(project) |
901 | 901 |
logger.info("%s has been unsuspended." % (project)) |
902 | 902 |
|
Also available in: Unified diff