# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Dannon Baker <dannonbaker@me.com> # Date 1282824612 14400 # Node ID e95e14f5e7a0db167a276570495e38f044b17092 # Parent 170229de46ca0b9ca21ea555d5085dd5224dcd79 Fix for the issue where multiple of the same action on separate outputs of a single tool were being overwritten as one. --- a/lib/galaxy/jobs/actions/post.py +++ b/lib/galaxy/jobs/actions/post.py @@ -341,16 +341,17 @@ class ActionBox(object): for key, val in incoming.iteritems(): if key.startswith('pja'): sp = key.split('__') + ao_key = sp[2] + sp[1] # flag / output_name / pjatype / desc - if not sp[2] in npd: - npd[sp[2]] = {'action_type' : sp[2], + if not ao_key in npd: + npd[ao_key] = {'action_type' : sp[2], 'output_name' : sp[1], 'action_arguments' : {}} if len(sp) > 3: if sp[3] == 'output_name': - npd[sp[2]]['output_name'] = val + npd[ao_key]['output_name'] = val else: - npd[sp[2]]['action_arguments'][sp[3]] = val + npd[ao_key]['action_arguments'][sp[3]] = val else: # Not pja stuff. pass --- a/static/scripts/galaxy.workflow_editor.canvas.js +++ b/static/scripts/galaxy.workflow_editor.canvas.js @@ -413,8 +413,8 @@ function Workflow( canvas_container ) { output_name : act.output_name, action_arguments : act.action_arguments } - post_job_actions[ act.type + act.output_name ] = null; - post_job_actions[ act.type + act.output_name ] = pja; + post_job_actions[ act.action_type + act.output_name ] = null; + post_job_actions[ act.action_type + act.output_name ] = pja; }); } if (!node.workflow_outputs){