Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2020-02-21 09:44:02 +01:00
2 changed files with 10 additions and 10 deletions
@@ -127,7 +127,7 @@
<type>select</type> <type>select</type>
<renderType>selectSingle</renderType> <renderType>selectSingle</renderType>
<foreign_table>tx_epproducts_domain_model_product</foreign_table> <foreign_table>tx_epproducts_domain_model_product</foreign_table>
<foreign_table_where>ORDER BY name</foreign_table_where> <foreign_table_where>ORDER BY name_internal</foreign_table_where>
<items type="array"> <items type="array">
<numIndex index="0" type="array"> <numIndex index="0" type="array">
<numIndex index="0">Keine Zuordnung</numIndex> <numIndex index="0">Keine Zuordnung</numIndex>
@@ -155,19 +155,19 @@
<numIndex index="0">Standard</numIndex> <numIndex index="0">Standard</numIndex>
<numIndex index="1">1</numIndex> <numIndex index="1">1</numIndex>
</numIndex> </numIndex>
<numIndex index="1" type="array"> <numIndex index="2" type="array">
<numIndex index="0">Basic</numIndex> <numIndex index="0">Basic</numIndex>
<numIndex index="1">5</numIndex> <numIndex index="1">5</numIndex>
</numIndex> </numIndex>
<numIndex index="2" type="array"> <numIndex index="3" type="array">
<numIndex index="0">Komfort</numIndex> <numIndex index="0">Komfort</numIndex>
<numIndex index="1">2</numIndex> <numIndex index="1">2</numIndex>
</numIndex> </numIndex>
<numIndex index="3" type="array"> <numIndex index="4" type="array">
<numIndex index="0">Deluxe</numIndex> <numIndex index="0">Deluxe</numIndex>
<numIndex index="1">3</numIndex> <numIndex index="1">3</numIndex>
</numIndex> </numIndex>
<numIndex index="4" type="array"> <numIndex index="5" type="array">
<numIndex index="0">Superdeluxe</numIndex> <numIndex index="0">Superdeluxe</numIndex>
<numIndex index="1">4</numIndex> <numIndex index="1">4</numIndex>
</numIndex> </numIndex>
@@ -86,7 +86,7 @@
<type>select</type> <type>select</type>
<renderType>selectSingle</renderType> <renderType>selectSingle</renderType>
<foreign_table>tx_epproducts_domain_model_product</foreign_table> <foreign_table>tx_epproducts_domain_model_product</foreign_table>
<foreign_table_where>ORDER BY name</foreign_table_where> <foreign_table_where>ORDER BY name_internal</foreign_table_where>
<items type="array"> <items type="array">
<numIndex index="0" type="array"> <numIndex index="0" type="array">
<numIndex index="0">Keine Zuordnung</numIndex> <numIndex index="0">Keine Zuordnung</numIndex>
@@ -114,19 +114,19 @@
<numIndex index="0">Standard</numIndex> <numIndex index="0">Standard</numIndex>
<numIndex index="1">1</numIndex> <numIndex index="1">1</numIndex>
</numIndex> </numIndex>
<numIndex index="1" type="array"> <numIndex index="2" type="array">
<numIndex index="0">Basic</numIndex> <numIndex index="0">Basic</numIndex>
<numIndex index="1">5</numIndex> <numIndex index="1">5</numIndex>
</numIndex> </numIndex>
<numIndex index="2" type="array"> <numIndex index="3" type="array">
<numIndex index="0">Komfort</numIndex> <numIndex index="0">Komfort</numIndex>
<numIndex index="1">2</numIndex> <numIndex index="1">2</numIndex>
</numIndex> </numIndex>
<numIndex index="3" type="array"> <numIndex index="4" type="array">
<numIndex index="0">Deluxe</numIndex> <numIndex index="0">Deluxe</numIndex>
<numIndex index="1">3</numIndex> <numIndex index="1">3</numIndex>
</numIndex> </numIndex>
<numIndex index="4" type="array"> <numIndex index="5" type="array">
<numIndex index="0">Superdeluxe</numIndex> <numIndex index="0">Superdeluxe</numIndex>
<numIndex index="1">4</numIndex> <numIndex index="1">4</numIndex>
</numIndex> </numIndex>