0012148: no sort of columns

* fixes "paging" parameter name

https://forge.tine20.org/view.php?id=12148

Change-Id: I6bcab89c466d84c6f079a4ee0c6328a330344466
Reviewed-on: http://gerrit.tine20.com/customers/3508
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>

diff --git a/tests/tine20/Tinebase/Server/JsonTests.php b/tests/tine20/Tinebase/Server/JsonTests.php
index a665d39..bfe547a 100644 (file)
--- a/tests/tine20/Tinebase/Server/JsonTests.php
+++ b/tests/tine20/Tinebase/Server/JsonTests.php
@@ -67,6 +67,28 @@ class Tinebase_Server_JsonTests extends TestCase
             ),
             'returns' => 'array'
         ), $smdArray['services']['Inventory.deleteInventoryItems']);
+
+        $this->assertEquals(array
+        (
+            'envelope' => 'JSON-RPC-2.0',
+            'transport' => 'POST',
+            'parameters' => array
+            (
+                array
+                (
+                    'type' => 'array',
+                    'optional' => false,
+                    'name' => 'filter'
+                ),
+                array
+                (
+                    'type' => 'array',
+                    'optional' => false,
+                    'name' => 'paging'
+                )
+            ),
+            'returns' => 'array'
+        ), $smdArray['services']['Inventory.searchInventoryItems']);
     }
 
     /**

diff --git a/tine20/Tinebase/Server/Json.php b/tine20/Tinebase/Server/Json.php
index 0b1f287..19c9ee6 100644 (file)
--- a/tine20/Tinebase/Server/Json.php
+++ b/tine20/Tinebase/Server/Json.php
@@ -427,7 +427,7 @@ class Tinebase_Server_Json extends Tinebase_Server_Abstract implements Tinebase_
                                 )),
                                 new Zend_Server_Method_Parameter(array(
                                     'type' => 'array',
-                                    'name' => 'pagination',
+                                    'name' => 'paging',
                                 )),
                             ),
                             'help'   => 'Search for ' . $simpleModelName . 's matching given arguments',