Unverified Commit 40b9e8a6 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #15508 from bernt-matthias/xsd-output-actions-fixes 

[22.05] xsd fixes for output actions
parents 5fd1141c eb4598fb

doc/schema_template.md

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ $tag:tool|outputs|data|actions://complexType[@name='Actions'] 
$tag:tool|outputs|data|actions|conditional://complexType[@name='ActionsConditional']

$tag:tool|outputs|data|actions|conditional|when://complexType[@name='ActionsConditionalWhen']

$tag:tool|outputs|data|actions|action://complexType[@name='Action']

$tag:tool|outputs|data|actions|action|option://complexType[@name='ActionsOption']

$tag:tool|outputs|data|discover_datasets://complexType[@name='OutputDiscoverDatasets']

$tag:tool|outputs|collection://complexType[@name='OutputCollection']

$tag:tool|outputs|collection|filter://complexType[@name='OutputFilter']

lib/galaxy/tool_util/xsd/galaxy.xsd

+22 −7
Original line number Diff line number Diff line
@@ -5645,22 +5645,30 @@ Source of the tabular data ``from_data_table``, ``from_param``, or ``from_file`` 
    </xs:attribute>

    <xs:attribute name="name" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en"></xs:documentation>

        <xs:documentation xml:lang="en"><![CDATA[

Name of the referred data table, parameter, or file (required).

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="column" type="xs:integer">

      <xs:annotation>

        <xs:documentation xml:lang="en"></xs:documentation>

        <xs:documentation xml:lang="en"><![CDATA[

The column to choose the value from (required)

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="offset" type="xs:integer">

      <xs:annotation>

        <xs:documentation xml:lang="en"></xs:documentation>

        <xs:documentation xml:lang="en"><![CDATA[

The row (of the options) to choose the value from (by default -1, ie. last row)

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="param_attribute" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en"></xs:documentation>

        <xs:documentation xml:lang="en"><![CDATA[

Applies to ``from_param``. The attribute of the parameter to use.

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

  </xs:complexType>
@@ -5699,7 +5707,7 @@ of this directive. 
      ]]></xs:documentation>

    </xs:annotation>

    <xs:sequence>

      <xs:element name="action" type="Action" minOccurs="1" maxOccurs="unbounded"/>

      <xs:group ref="ActionsElement" minOccurs="1" maxOccurs="unbounded"/>

    </xs:sequence>

    <xs:attribute name="value" type="xs:string" use="optional">

      <xs:annotation>
@@ -5823,6 +5831,13 @@ Applies to ``param_value``, ``boolean``</xs:documentation> 
        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="iterate" type="PermissiveBoolean">

      <xs:annotation>

        <xs:documentation xml:lang="en"><![CDATA[

Applies to ``insert_column``. Default is ``False``</xs:documentation>

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="param_attribute" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en">
@@ -5835,9 +5850,9 @@ Applies to ``param_value``</xs:documentation> 
        <xs:documentation xml:lang="en">Applies to ``multiple_splitter``</xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="strip" type="PermissiveBoolean">

    <xs:attribute name="strip" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en">Applies to ``column_strip``</xs:documentation>

        <xs:documentation xml:lang="en">Applies to ``column_strip``. The given string is removed from the start or end of the column.</xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="old_column" type="xs:string">