2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/471457199db2/ Changeset: 471457199db2 Branch: provenance User: Kyle Ellrott Date: 2013-06-20 18:22:55 Summary: Casting UUIDs to strings for JSON serialization in provenance report. Affected #: 1 file diff -r 0bb601dceb65bf7a6dbf23ab7566054e4feead0b -r 471457199db2b1e9979887bea8dbb6528e2b6863 lib/galaxy/webapps/galaxy/api/provenance.py --- a/lib/galaxy/webapps/galaxy/api/provenance.py +++ b/lib/galaxy/webapps/galaxy/api/provenance.py @@ -43,7 +43,7 @@ item = item.copied_from_library_dataset_dataset_association return { "id" : trans.security.encode_id(item.id), - "uuid" : item.dataset.uuid, + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid), "tool_id" : item.creating_job.tool_id, "parameters" : self._get_job_record(trans, item.creating_job, follow) } @@ -59,7 +59,7 @@ else: out[in_d.name] = { "id" : trans.security.encode_id(in_d.dataset.id), - "uuid" : in_d.dataset.dataset.uuid + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( in_d.dataset.dataset.uuid ) } return out https://bitbucket.org/galaxy/galaxy-central/commits/13b5283f964c/ Changeset: 13b5283f964c User: dannon Date: 2013-06-20 18:43:08 Summary: Merged in kellrott/galaxy-central/provenance (pull request #186) BugFix: Casting UUIDs to strings for JSON serialization in provenance report. Affected #: 1 file diff -r 7362302b2c638d377931fa710d40ba2f86f25dba -r 13b5283f964cfa7364b653f2c578b4d7cc27c6e5 lib/galaxy/webapps/galaxy/api/provenance.py --- a/lib/galaxy/webapps/galaxy/api/provenance.py +++ b/lib/galaxy/webapps/galaxy/api/provenance.py @@ -43,7 +43,7 @@ item = item.copied_from_library_dataset_dataset_association return { "id" : trans.security.encode_id(item.id), - "uuid" : item.dataset.uuid, + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid), "tool_id" : item.creating_job.tool_id, "parameters" : self._get_job_record(trans, item.creating_job, follow) } @@ -59,7 +59,7 @@ else: out[in_d.name] = { "id" : trans.security.encode_id(in_d.dataset.id), - "uuid" : in_d.dataset.dataset.uuid + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( in_d.dataset.dataset.uuid ) } return out Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.