Commit c5b87666 authored by Ayres, Andrew's avatar Ayres, Andrew
Browse files

Merge branch '119-migrate-jana-from-repeated-inputs-to-multiple-select' into 'dev' 

Changes jana xml to multiple select

Closes #119

See merge request ndip/galaxy-tools!201
parents 74f7b384 ce051fad

tools/neutrons/single_crystal_diffraction/interactivetool_jana2020.xml

+6 −8
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
        /setup.sh \$GALAXY_TOOL_USER &&

        ln -s \${GALAXY_WORKING_DIR}/outputs /home/novnc_user/outputs &&

        ln -s /home/novnc_user/outputs /home/novnc_user/Downloads &&

        #for $i, $s in enumerate($datasets)

            #set $name = os.path.basename(str($s.input.element_identifier))

            su novnc_user -c "cp '${s.input}' '/home/novnc_user/inputs/${name}'" &&

        #for $el in $input:

            #set $name = os.path.basename(str($el.element_identifier))

            su novnc_user -c "cp '${el}' '/home/novnc_user/inputs/${name}'" &&

        #end for

        /start.sh \$GALAXY_TOOL_USER

        ]]>
@@ -31,9 +31,7 @@ 
    <inputs>

        <param name="X_RESOLUTION" type="integer" optional="false" value="1920" label="Resolution for X dimension"/>

        <param name="Y_RESOLUTION" type="integer" optional="false" value="1080" label="Resolution for Y dimension"/>

         <repeat name="datasets" title="Datasets">

            <param name="input" type="data" label="Dataset"/>

        </repeat>

        <param name="input" type="data" multiple="true" label="Dataset"/>

    </inputs>

    <outputs>

        <collection type="list" name="output" label="Jana2020 Output Files">