Merge branch 'release/1.1.1'

all-ride · Nov 3, 2016 · 06f561d · 06f561d
2 parents 57be127 + 58a0c0f
commit 06f561d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# [1.1.1]
+## Updated
+- ScaffoldTable: set $orderStatements and $searchFields to protected
+- ScaffoldTable: added missing use statement for OrmException
+
 # [1.1.0]
 ## Updated
 - use date time form component for datetime fields

diff --git a/src/ride/web/orm/table/scaffold/ScaffoldTable.php b/src/ride/web/orm/table/scaffold/ScaffoldTable.php
@@ -3,6 +3,7 @@
 namespace ride\web\orm\table\scaffold;
 
 use ride\library\i18n\translator\Translator;
+use ride\library\orm\exception\OrmException;
 use ride\library\orm\definition\field\RelationField;
 use ride\library\orm\definition\ModelTable as OrmModelTable;
 use ride\library\orm\model\Model;
@@ -16,13 +17,13 @@ class ScaffoldTable extends ModelTable {
      * Array with the field names to search in
      * @var array
      */
-    private $searchFields;
+    protected $searchFields;
 
     /**
      * Array with the statements for the order functionality
      * @var array
      */
-    private $orderStatements;
+    protected $orderStatements;
 
     /**
      * Constructs a new scaffold table