Skip to content

Commit 4474486

Browse files
authored
Merge pull request #3315 from zaknafain/multiselect_options
Multi select Search Placeholder Fix
2 parents 2dba791 + 6820898 commit 4474486

4 files changed

Lines changed: 18 additions & 17 deletions

File tree

app/assets/javascripts/rails_admin/ra.filtering-multiselect.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
sortable: false,
2020
removable: true,
2121
regional: {
22-
up: "Up",
23-
down: "Down",
24-
add: "Add",
25-
chooseAll: "Choose all",
26-
chosen: "Chosen records",
27-
clearAll: "Clear all",
28-
remove: "Remove"
22+
add: 'Add',
23+
chooseAll: 'Choose all',
24+
clearAll: 'Clear all',
25+
down: 'Down',
26+
remove: 'Remove',
27+
search: 'Search',
28+
up: 'Up'
2929
},
3030
searchDelay: 400,
3131
remote_source: null,

app/views/rails_admin/main/_form_enumeration.html.haml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
sortable: false,
88
cacheAll: true,
99
regional: {
10+
add: t("admin.misc.add_new"),
1011
chooseAll: t("admin.misc.chose_all"),
11-
chosen: t("admin.misc.chosen", name: config.label_plural),
1212
clearAll: t("admin.misc.clear_all"),
13+
down: t("admin.misc.down"),
14+
remove: t("admin.misc.remove"),
1315
search: t("admin.misc.search"),
14-
up: t("admin.misc.up"),
15-
down: t("admin.misc.down")
16+
up: t("admin.misc.up")
1617
}
1718
}
1819
= form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true})

app/views/rails_admin/main/_form_filtering_multiselect.html.haml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
removable: !!field.removable,
3030
cacheAll: !!field.associated_collection_cache_all,
3131
regional: {
32-
chooseAll: t("admin.misc.chose_all"),
33-
chosen: t("admin.misc.chosen", name: config.label_plural),
34-
clearAll: t("admin.misc.clear_all"),
35-
search: t("admin.misc.search"),
36-
up: t("admin.misc.up"),
37-
down: t("admin.misc.down")
32+
add: t('admin.misc.add_new'),
33+
chooseAll: t('admin.misc.chose_all'),
34+
clearAll: t('admin.misc.clear_all'),
35+
down: t('admin.misc.down'),
36+
remove: t('admin.misc.remove'),
37+
search: t('admin.misc.search'),
38+
up: t('admin.misc.up')
3839
}
3940
}
4041

config/locales/rails_admin.en.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ en:
3636
bulk_menu_title: "Selected items"
3737
remove: "Remove"
3838
add_new: "Add new"
39-
chosen: "Chosen %{name}"
4039
chose_all: "Choose all"
4140
clear_all: "Clear all"
4241
up: "Up"

0 commit comments

Comments
 (0)