Revision 88f5242e snf-astakos-app/astakos/api/projects.py
| b/snf-astakos-app/astakos/api/projects.py | ||
|---|---|---|
| 128 | 128 |
for application in applications: |
| 129 | 129 |
d = {
|
| 130 | 130 |
"id": application.id, |
| 131 |
"project": application.chain_id,
|
|
| 131 |
"project": application.chain.uuid,
|
|
| 132 | 132 |
"state": APPLICATION_STATE_SHOW[application.state], |
| 133 | 133 |
"comments": application.comments, |
| 134 | 134 |
} |
| ... | ... | |
| 151 | 151 |
for project in projects: |
| 152 | 152 |
application = project.application |
| 153 | 153 |
d = {
|
| 154 |
"id": project.id, |
|
| 154 |
"id": project.uuid,
|
|
| 155 | 155 |
"application": application.id, |
| 156 | 156 |
"state": PROJECT_STATE_SHOW[project.overall_state()], |
| 157 | 157 |
"creation_date": project.creation_date, |
| ... | ... | |
| 189 | 189 |
d = {
|
| 190 | 190 |
"id": membership.id, |
| 191 | 191 |
"user": membership.person.uuid, |
| 192 |
"project": membership.project_id,
|
|
| 192 |
"project": membership.project.uuid,
|
|
| 193 | 193 |
"state": MEMBERSHIP_STATE_SHOW[membership.state], |
| 194 | 194 |
"allowed_actions": allowed_actions, |
| 195 | 195 |
} |
| ... | ... | |
| 332 | 332 |
|
| 333 | 333 |
|
| 334 | 334 |
def _get_project(project_id, request_user=None): |
| 335 |
project = functions.get_project_by_id(project_id) |
|
| 335 |
project = functions.get_project_by_uuid(project_id)
|
|
| 336 | 336 |
functions.project_check_allowed( |
| 337 | 337 |
project, request_user, level=functions.ANY_LEVEL) |
| 338 | 338 |
return project |
| ... | ... | |
| 447 | 447 |
request_user=user) |
| 448 | 448 |
|
| 449 | 449 |
result = {"application": application.id,
|
| 450 |
"id": application.chain_id
|
|
| 450 |
"id": application.chain.uuid,
|
|
| 451 | 451 |
} |
| 452 | 452 |
return json_response(result, status_code=201) |
| 453 | 453 |
|
| ... | ... | |
| 501 | 501 |
def make_application_query(input_data): |
| 502 | 502 |
project_id = input_data.get("project")
|
| 503 | 503 |
if project_id is not None: |
| 504 |
if not isinstance(project_id, (int, long)): |
|
| 505 |
raise faults.BadRequest("'project' must be integer")
|
|
| 506 |
return Q(chain=project_id) |
|
| 504 |
return Q(chain__uuid=project_id) |
|
| 507 | 505 |
return Q() |
| 508 | 506 |
|
| 509 | 507 |
|
| ... | ... | |
| 585 | 583 |
def make_membership_query(input_data): |
| 586 | 584 |
project_id = input_data.get("project")
|
| 587 | 585 |
if project_id is not None: |
| 588 |
if not isinstance(project_id, (int, long)): |
|
| 589 |
raise faults.BadRequest("'project' must be integer")
|
|
| 590 |
return Q(project=project_id) |
|
| 586 |
return Q(project__uuid=project_id) |
|
| 591 | 587 |
return Q() |
| 592 | 588 |
|
| 593 | 589 |
|
Also available in: Unified diff