Merge branch 'dev'

GoyaPtyLtd · Mar 24, 2023 · db47d51 · db47d51
2 parents c0e3802 + 7780c68
commit db47d51
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/lib/RESTfm/BackendFileMakerDataApi/FileMakerDataApi.php b/lib/RESTfm/BackendFileMakerDataApi/FileMakerDataApi.php
@@ -439,6 +439,10 @@ public function getRecords ($layout,
         $params['_offset'] = $offset;
         $params['_limit']  = $limit;
 
+        if (! empty($sort)) {
+            $params['_sort'] = json_encode($sort);
+        }
+
         $queryString = $this->_dataToQueryString($params);
         if (!empty($queryString)) { $queryString = '?' . $queryString;}
 
@@ -560,6 +564,11 @@ public function findRecords (
         //    'Pcode' => '==0810',
         //));
 
+        if (empty($query)) {
+            // Do a "get" instead of a "find" if $query is empty
+            return $this->getRecords($layout, $limit, $offset, $sort, $params);
+        }
+
         $params['query']  = $query;
         $params['offset'] = (string)$offset;
         $params['limit']  = (string)$limit;
@@ -573,7 +582,7 @@ public function findRecords (
                                 '/layouts/' .
                                 rawurlencode($layout) .
                                 '/_find',
-                          'POST', $params);
+                                'POST', $params);
 
         $result = $this->curl_exec();
 
@@ -819,7 +828,7 @@ protected function databasesUrl () {
      *
      * @return string
      */
-    protected function productinfoUrl () {
+    protected function productInfoUrl () {
         return('/fmi/data/' . self::BACKEND_VERSION . '/productinfo');
     }
 

diff --git a/lib/RESTfm/BackendFileMakerDataApi/OpsField.php b/lib/RESTfm/BackendFileMakerDataApi/OpsField.php
@@ -25,11 +25,17 @@
 class OpsField extends \RESTfm\OpsFieldAbstract {
 
     /**
-     * @var \RESTfm\BackendFileMakerDataApi\Backend
+     * @var \RESTfm\BackendFileMakerDataApi\Backend|null
      *  Handle to backend object.
      */
     protected $_backend = NULL;
 
+    /**
+     * @var string
+     *  Layout name.
+     */
+    protected $_layout = '';
+
     /**
      * Construct a new Field-level Operation object.
      *

diff --git a/lib/RESTfm/BackendFileMakerDataApi/OpsLayout.php b/lib/RESTfm/BackendFileMakerDataApi/OpsLayout.php
@@ -34,7 +34,7 @@ class OpsLayout extends \RESTfm\OpsLayoutAbstract {
      * @var string
      *  Layout name.
      */
-    protected $_layout;
+    protected $_layout = '';
 
     /**
      * Construct a new Record-level Operation object.

diff --git a/lib/RESTfm/BackendFileMakerDataApi/OpsRecord.php b/lib/RESTfm/BackendFileMakerDataApi/OpsRecord.php
@@ -30,6 +30,12 @@ class OpsRecord extends \RESTfm\OpsRecordAbstract {
      */
     protected $_backend = NULL;
 
+    /**
+     * @var string
+     *  Layout name.
+     */
+    protected $_layout = '';
+
     /**
      * Construct a new Record-level Operation object.
      *