Skip to content

2.0 #58

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

Open
wants to merge 4 commits into
base: 2.0
Choose a base branch
from
Open

2.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a5f482
fixing issue: uninitialized constant ActiveadminSettingsCached::DSL (…
asfour75 Apr 26, 2022
0cca9bc
enabling boolean, time picker input fields
asfour75 Apr 26, 2022
8501fc8
enabling boolean, time picker input fields
asfour75 Apr 26, 2022
3d6a3a7
sort fields
asfour75 Apr 26, 2022
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
2 changes: 1 addition & 1 deletion app/views/admin/settings/_index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</tr>
</thead>
<tbody>
<% settings_model.settings.each_pair do |field_name, value| %>
<% settings_model.settings.sort.to_h.each_pair do |field_name, value| %>
<tr class="odd">
<td><strong><%= f.label field_name, t("settings.attributes.#{field_name}", default: field_name) %></strong></td>
<td>
Expand Down
1 change: 1 addition & 0 deletions lib/activeadmin_settings_cached.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true

require 'activeadmin_settings_cached/engine'
require 'activeadmin_settings_cached/dsl'

module ActiveadminSettingsCached
class Configuration
Expand Down
22 changes: 17 additions & 5 deletions lib/activeadmin_settings_cached/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,23 @@ def field_options(field_name, value)
collection: default_value, #TODO: allow multiply for colleactions
selected: value,
}
# TODO: display checkboxes for booleans
# elsif (default_value.is_a?(TrueClass) || default_value.is_a?(FalseClass))
# {
# input_html: { checked: value }, label: '', checked_value: 'true', unchecked_value: 'false'
# }
elsif (field_name.include?("time") || field_name.include?("hour"))
{
as: :time_picker,
input_html: { value: value, placeholder: default_value },
}
elsif (default_value.is_a?(TrueClass) || default_value.is_a?(FalseClass))
{
as: :boolean,
input_html: { checked: value }, label: '', checked_value: 'true', unchecked_value: 'false'
}


#elsif (default_value.is_a?(TrueClass) || default_value.is_a?(FalseClass)) &&
# display[settings_name].to_s == 'boolean'
# {
# input_html: { checked: value }, label: '', checked_value: 'true', unchecked_value: 'false'
# }
else
{
input_html: { value: value, placeholder: default_value },
Expand Down