Add support for up to 4 fields to multipairfield (#15531)

2 files changed, 47 insertions, 5 deletions

diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index 50be27cbfc..c0a881c6d6 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -348,26 +348,68 @@
 </div>
 
 <div piwik-field uicontrol="multituple" name="multitupletext"
-     data-title="Multiple values"
+     data-title="Multiple values (two)"
      value="[]"
      inline-help="Multi Tuple text and text"
      ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null}}'>
 </div>
 
 <div piwik-field uicontrol="multituple" name="multitupletextvalue"
-     data-title="Multiple values with values"
+     data-title="Multiple values with values (two)"
      value='[{"index": "test", "value":"myfoo"},{"index": "test 2", "value":"myfoo 2"}]'
      inline-help="Multi Tuple again."
      ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null}}'>
 </div>
 
 <div piwik-field uicontrol="multituple" name="multitupleselect"
-     data-title="Multiple values with select"
+     data-title="Multiple values with select (two)"
      value='[{"index": "test", "value": "myfoo"}]'
      inline-help="Multi Tuple select and text"
      ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"select","availableValues":{"test":"test"}},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null}}'>
 </div>
 
+<div piwik-field uicontrol="multituple" name="multitupletext"
+     data-title="Multiple values (three)"
+     value="[]"
+     inline-help="Multi Tuple text and text"
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
+<div piwik-field uicontrol="multituple" name="multitupletextvalue"
+     data-title="Multiple values with values (three)"
+     value='[{"index": "test", "value":"myfoo"},{"index": "test 2", "value":"myfoo 2"}]'
+     inline-help="Multi Tuple again."
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
+<div piwik-field uicontrol="multituple" name="multitupleselect"
+     data-title="Multiple values with select (three)"
+     value='[{"index": "test", "value": "myfoo"}]'
+     inline-help="Multi Tuple select and text"
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"select","availableValues":{"test":"test"}},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
+<div piwik-field uicontrol="multituple" name="multitupletext"
+     data-title="Multiple values (four)"
+     value="[]"
+     inline-help="Multi Tuple text and text"
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null},"field4":{"key":"value3","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
+<div piwik-field uicontrol="multituple" name="multitupletextvalue"
+     data-title="Multiple values with values (four)"
+     value='[{"index": "test", "value":"myfoo"},{"index": "test 2", "value":"myfoo 2"}]'
+     inline-help="Multi Tuple again."
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"text","availableValues":null},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null},"field4":{"key":"value3","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
+<div piwik-field uicontrol="multituple" name="multitupleselect"
+     data-title="Multiple values with select (four)"
+     value='[{"index": "test", "value": "myfoo"}]'
+     inline-help="Multi Tuple select and text"
+     ui-control-attributes='{"field1":{"key":"index","title":"Index","uiControl":"select","availableValues":{"test":"test"}},"field2":{"key":"value","title":"Value","uiControl":"text","availableValues":null},"field3":{"key":"value2","title":"Value","uiControl":"text","availableValues":null},"field4":{"key":"value3","title":"Value","uiControl":"text","availableValues":null}}'>
+</div>
+
 <div piwik-field uicontrol="multituple" name="multituplesingleselect"
      data-title="Multi One Select"
      value='[{"index": "test", "value": "myfoo"}]'
diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
index 1f169c6d72..2603bea45c 100644
--- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
+++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ba4b8e30468e93d5720ddc23baa0877eb424fadd808165cb2996cc75f59d26c
-size 1423939
+oid sha256:3185e9518fd5e6f0bb1829999511e9462fdee63a580d6b06aea41e0e15abff99
+size 1663363