2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b6af8a5aefb3/ Changeset: b6af8a5aefb3 User: nsoranzo Date: 2014-03-28 12:54:53 Summary: Workflow API: show also workflow owner, so a user can check it before importing. Affected #: 1 file diff -r 37fa3f5a47f8fc45755ac1ca758a852bb76ea999 -r b6af8a5aefb3c8a6dbd360d48980a2e96bf67ac8 lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -76,6 +76,7 @@ item = wf.to_dict( value_mapper={ 'id': trans.security.encode_id } ) encoded_id = trans.security.encode_id(wf.id) item['url'] = url_for('workflow', id=encoded_id) + item['owner'] = wf.user.username rval.append(item) for wf_sa in trans.sa_session.query( trans.app.model.StoredWorkflowUserShareAssociation ).filter_by( user=trans.user ).join( 'stored_workflow' ).filter( @@ -84,6 +85,7 @@ item = wf_sa.stored_workflow.to_dict( value_mapper={ 'id': trans.security.encode_id } ) encoded_id = trans.security.encode_id(wf_sa.stored_workflow.id) item['url'] = url_for( 'workflow', id=encoded_id ) + item['owner'] = wf_sa.stored_workflow.user.username rval.append(item) return rval @@ -111,6 +113,7 @@ return "That workflow does not exist." item = stored_workflow.to_dict( view='element', value_mapper={ 'id': trans.security.encode_id } ) item['url'] = url_for('workflow', id=workflow_id) + item['owner'] = stored_workflow.user.username latest_workflow = stored_workflow.latest_workflow inputs = {} for step in latest_workflow.steps: https://bitbucket.org/galaxy/galaxy-central/commits/f7810af7f40c/ Changeset: f7810af7f40c User: dannon Date: 2014-03-31 19:21:49 Summary: Merged in nsoranzo/galaxy-central (pull request #355) Workflow API: show also workflow owner, so a user can check it before importing. Affected #: 1 file diff -r 4d593e0fafe501f233cfe8c67ad608bd12a37ff6 -r f7810af7f40c9215f5a3db77053563bf7db0ebde lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -76,6 +76,7 @@ item = wf.to_dict( value_mapper={ 'id': trans.security.encode_id } ) encoded_id = trans.security.encode_id(wf.id) item['url'] = url_for('workflow', id=encoded_id) + item['owner'] = wf.user.username rval.append(item) for wf_sa in trans.sa_session.query( trans.app.model.StoredWorkflowUserShareAssociation ).filter_by( user=trans.user ).join( 'stored_workflow' ).filter( @@ -84,6 +85,7 @@ item = wf_sa.stored_workflow.to_dict( value_mapper={ 'id': trans.security.encode_id } ) encoded_id = trans.security.encode_id(wf_sa.stored_workflow.id) item['url'] = url_for( 'workflow', id=encoded_id ) + item['owner'] = wf_sa.stored_workflow.user.username rval.append(item) return rval @@ -111,6 +113,7 @@ return "That workflow does not exist." item = stored_workflow.to_dict( view='element', value_mapper={ 'id': trans.security.encode_id } ) item['url'] = url_for('workflow', id=workflow_id) + item['owner'] = stored_workflow.user.username latest_workflow = stored_workflow.latest_workflow inputs = {} for step in latest_workflow.steps: 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.