Revision dc1c2b45 snf-astakos-app/astakos/api/projects.py
| b/snf-astakos-app/astakos/api/projects.py | ||
|---|---|---|
| 42 | 42 |
|
| 43 | 43 |
from snf_django.lib import api |
| 44 | 44 |
from snf_django.lib.api import faults |
| 45 |
from .util import user_from_token, invert_dict, read_json_body |
|
| 45 |
from snf_django.lib.api import utils |
|
| 46 |
from .util import user_from_token, invert_dict, check_is_dict |
|
| 46 | 47 |
|
| 47 | 48 |
from astakos.im import functions |
| 48 | 49 |
from astakos.im.models import ( |
| ... | ... | |
| 319 | 320 |
@transaction.commit_on_success |
| 320 | 321 |
def create_project(request): |
| 321 | 322 |
user = request.user |
| 322 |
data = request.body |
|
| 323 |
app_data = json.loads(data) |
|
| 323 |
app_data = utils.get_json_body(request) |
|
| 324 | 324 |
return submit_new_project(app_data, user) |
| 325 | 325 |
|
| 326 | 326 |
|
| ... | ... | |
| 357 | 357 |
@transaction.commit_on_success |
| 358 | 358 |
def modify_project(request, project_id): |
| 359 | 359 |
user = request.user |
| 360 |
data = request.body |
|
| 361 |
app_data = json.loads(data) |
|
| 360 |
app_data = utils.get_json_body(request) |
|
| 362 | 361 |
return submit_modification(app_data, user, project_id=project_id) |
| 363 | 362 |
|
| 364 | 363 |
|
| ... | ... | |
| 548 | 547 |
def get_action(actions, input_data): |
| 549 | 548 |
action = None |
| 550 | 549 |
data = None |
| 550 |
check_is_dict(input_data) |
|
| 551 | 551 |
for option in actions.keys(): |
| 552 | 552 |
if option in input_data: |
| 553 | 553 |
if action: |
| ... | ... | |
| 586 | 586 |
@transaction.commit_on_success |
| 587 | 587 |
def project_action(request, project_id): |
| 588 | 588 |
user = request.user |
| 589 |
data = request.body |
|
| 590 |
input_data = json.loads(data) |
|
| 589 |
input_data = utils.get_json_body(request) |
|
| 591 | 590 |
|
| 592 | 591 |
func, action_data = get_action(PROJECT_ACTION, input_data) |
| 593 | 592 |
with ExceptionHandler(): |
| ... | ... | |
| 707 | 706 |
@transaction.commit_on_success |
| 708 | 707 |
def membership_action(request, memb_id): |
| 709 | 708 |
user = request.user |
| 710 |
input_data = read_json_body(request, default={})
|
|
| 709 |
input_data = utils.get_json_body(request)
|
|
| 711 | 710 |
func, action_data = get_action(MEMBERSHIP_ACTION, input_data) |
| 712 | 711 |
with ExceptionHandler(): |
| 713 | 712 |
func(memb_id, user, reason=action_data) |
Also available in: Unified diff