FIx

fusioninventory · Apr 11, 2024 · 1de016c · 1de016c
1 parent e732fa4
commit 1de016c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/inc/deployuserinteraction.class.php b/inc/deployuserinteraction.class.php
@@ -356,10 +356,10 @@ function check_data_from_form() {
 
       return [
          'id'       => intval($id),
-         'type'     => $type,
          'name'     => $name,
          'title'    => $title,
          'text'     => str_replace('\r\n', PluginFusioninventoryDeployUserinteraction::RN_TRANSFORMATION, $text),
+         'type'     => $type,
          'template' => intval($template)
       ];
    }

diff --git a/tests/Unit/Deploy/DeployUserinteractionTest.php b/tests/Unit/Deploy/DeployUserinteractionTest.php
@@ -184,10 +184,10 @@ public function testAdd_item() {
 
       $interaction     = new PluginFusioninventoryDeployUserinteraction();
       $params = ['id'                   => intval($packages_id),
-                 'type'                 => 'before',
                  'name'                 => 'interaction 1',
                  'title'                => 'My title',
                  'text'                 => 'my text',
+                 'type'                 => 'before',
                  'template'             => 0,
                 ];
 
@@ -197,17 +197,16 @@ public function testAdd_item() {
       $this->assertEquals($expected, $json);
 
       $params = ['id'                   => intval($packages_id),
-                 'type'                 => 'after',
                  'name'                 => 'interaction 2',
                  'title'                => 'My title',
                  'text'                 => 'my text',
+                 'type'                 => 'after',
                  'template'             => 0,
                 ];
       $interaction->add_item($params);
       $expected = '{"jobs":{"checks":[],"associatedFiles":[],"actions":[],"userinteractions":[{"name":"interaction 1","title":"My title","text":"my text","type":"before","template":0},{"name":"interaction 2","title":"My title","text":"my text","type":"after","template":0}]},"associatedFiles":[]}';
       $json     = Toolbox::stripslashes_deep($interaction->getJson($packages_id));
       $this->assertEquals($expected, $json);
-
    }