Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi select Search Placeholder Fix #3315

Merged
merged 6 commits into from
Feb 28, 2021
Merged

Multi select Search Placeholder Fix #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f9603b
Add some translations for multiselect
zaknafain Oct 19, 2020
f3c5fb9
Remove chosen
zaknafain Oct 22, 2020
5a44c7d
Remove console output again
zaknafain Oct 22, 2020
1b33c30
Update translations in enumeration form
zaknafain Oct 22, 2020
eb66306
Simple change for test trigger
zaknafain Oct 22, 2020
6820898
Some more minor changes as test trigger
zaknafain Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
sortable: false,
removable: true,
regional: {
up: "Up",
down: "Down",
add: "Add",
chooseAll: "Choose all",
chosen: "Chosen records",
clearAll: "Clear all",
remove: "Remove"
add: 'Add',
chooseAll: 'Choose all',
clearAll: 'Clear all',
down: 'Down',
remove: 'Remove',
search: 'Search',
up: 'Up'
},
searchDelay: 400,
remote_source: null,
Expand Down
7 changes: 4 additions & 3 deletions app/views/rails_admin/main/_form_enumeration.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
sortable: false,
cacheAll: true,
regional: {
add: t("admin.misc.add_new"),
chooseAll: t("admin.misc.chose_all"),
chosen: t("admin.misc.chosen", name: config.label_plural),
clearAll: t("admin.misc.clear_all"),
down: t("admin.misc.down"),
remove: t("admin.misc.remove"),
search: t("admin.misc.search"),
up: t("admin.misc.up"),
down: t("admin.misc.down")
up: t("admin.misc.up")
}
}
= 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})
13 changes: 7 additions & 6 deletions app/views/rails_admin/main/_form_filtering_multiselect.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
removable: !!field.removable,
cacheAll: !!field.associated_collection_cache_all,
regional: {
chooseAll: t("admin.misc.chose_all"),
chosen: t("admin.misc.chosen", name: config.label_plural),
clearAll: t("admin.misc.clear_all"),
search: t("admin.misc.search"),
up: t("admin.misc.up"),
down: t("admin.misc.down")
add: t('admin.misc.add_new'),
chooseAll: t('admin.misc.chose_all'),
clearAll: t('admin.misc.clear_all'),
down: t('admin.misc.down'),
remove: t('admin.misc.remove'),
search: t('admin.misc.search'),
up: t('admin.misc.up')
}
}

Expand Down
1 change: 0 additions & 1 deletion config/locales/rails_admin.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ en:
bulk_menu_title: "Selected items"
remove: "Remove"
add_new: "Add new"
chosen: "Chosen %{name}"
chose_all: "Choose all"
clear_all: "Clear all"
up: "Up"
Expand Down