add missing sort_null_last + update schema dump

Ref: #676
directus · Jan 11, 2019 · 368684b · 368684b
1 parent fa76c9b
commit 368684b
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 61 deletions.
diff --git a/migrations/db/seeds/FieldsSeeder.php b/migrations/db/seeds/FieldsSeeder.php
@@ -968,6 +968,14 @@ public function run()
                 'interface' => 'numeric',
                 'locked' => 1
             ],
+            [
+                'collection' => 'directus_settings',
+                'field' => 'sort_null_last',
+                'type' => \Directus\Database\Schema\DataTypes::TYPE_BOOLEAN,
+                'interface' => 'toggle',
+                'locked' => 1,
+                'note' => 'Will sort values with null at the end of the result'
+            ],
             [
                 'collection' => 'directus_settings',
                 'field' => 'auto_sign_out',

diff --git a/migrations/upgrades/schemas/20190111212736_add_missing_settings_field.php b/migrations/upgrades/schemas/20190111212736_add_missing_settings_field.php
@@ -15,6 +15,10 @@ public function up()
                 'type' => 'integer',
                 'interface' => 'numeric',
             ],
+            'sort_null_last' => [
+                'type' => 'boolean',
+                'interface' => 'toggle',
+            ],
             'auto_sign_out' => [
                 'type' => 'integer',
                 'interface' => 'numeric',

diff --git a/src/core/Directus/Util/Installation/InstallerUtils.php b/src/core/Directus/Util/Installation/InstallerUtils.php
@@ -656,6 +656,10 @@ private static function getDefaultSettings($data)
                 'key' => 'default_limit',
                 'value' => '200'
             ],
+            [
+                'key' => 'sort_null_last',
+                'value' => 1
+            ],
             [
                 'key' => 'auto_sign_out',
                 'value' => '60'