Use default settings extender (#44)

FriendsOfFlarum · Aug 4, 2022 · 901acbe · 901acbe
1 parent c86f5ce
commit 901acbe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "flarum/core": "^1.3.0"
+    "flarum/core": "^1.3.1"
   },
   "authors": [
     {

diff --git a/extend.php b/extend.php
@@ -45,7 +45,8 @@
         }),
 
     (new Extend\Settings())
-        ->serializeToForum('fof-merge-discussions.search_limit', 'fof-merge-discussions.search_limit', 'intVal', 4),
+        ->default('fof-merge-discussions.search_limit', 4)
+        ->serializeToForum('fof-merge-discussions.search_limit', 'fof-merge-discussions.search_limit', 'intVal'),
 
     (new Extend\View())
         ->namespace('fof-merge-discussions', __DIR__.'/resources/views'),

diff --git a/js/src/admin/index.js b/js/src/admin/index.js
@@ -15,7 +15,6 @@ app.initializers.add('fof/merge-discussions', () => {
       label: app.translator.trans('fof-merge-discussions.admin.settings.search_result_label'),
       type: 'number',
       setting: 'fof-merge-discussions.search_limit',
-      placeholder: '4',
       help: app.translator.trans('fof-merge-discussions.admin.settings.search_result_help'),
       min: 1,
       max: 99,

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -34,7 +34,7 @@ fof-merge-discussions:
     permissions:
       merge_discussions_label: Merge discussions
     settings:
-      search_result_help: How many discussions should be returned when searching within the `Merge Discussions` modal. Default is 4
+      search_result_help: How many discussions should be returned when searching within the `Merge Discussions` modal.
       search_result_label: Merge Discussion Search Limit
 
   api: