Unverified Commit 76a8e12d authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #13325 from mvdbeek/remap_fix_sentry 

[21.09] Fix resuming job when job has optional data parameters
parents 76d2f637 bec9d4b4

lib/galaxy/tools/actions/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -675,11 +675,12 @@ class DefaultToolAction: 
        return remapped_hdas



    def __remap_parameters(self, job_to_remap, jtid, jtod, out_data):

        input_values = {p.name: json.loads(p.value) for p in job_to_remap.parameters}

        input_values = {p.name: json.loads(p.value) for p in job_to_remap.parameters if p.value is not None}

        old_dataset_id = jtod.dataset_id

        new_dataset_id = out_data[jtod.name].id

        input_values = update_dataset_ids(input_values, {old_dataset_id: new_dataset_id}, src='hda')

        for p in job_to_remap.parameters:

            if p.name in input_values:

                p.value = json.dumps(input_values[p.name])

        jtid.dataset = out_data[jtod.name]

        jtid.dataset.hid = jtod.dataset.hid

lib/galaxy_test/api/test_workflows.py

+1 −0
Original line number Diff line number Diff line
@@ -967,6 +967,7 @@ steps: 
          cond_param_inner: true

          input1:

            $link: 0/out_file1

    thedata: null

  cat:

    tool_id: cat1

    in:

test/functional/tools/identifier_multiple_in_conditional.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
                </conditional>

            </when>

        </conditional>

        <param name="thedata" type="data" optional="true" label="Optional dummy data"/>

    </inputs>

    <outputs>

        <data name="output1" format="tabular" from_work_dir="output1" />