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.

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

Remove capitalization helper #3396

Merged
merged 1 commit into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 6 additions & 14 deletions app/helpers/rails_admin/application_helper.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
module RailsAdmin
module ApplicationHelper
def capitalize_first_letter(wording)
return nil unless wording.present? && wording.is_a?(String)

wording = wording.dup
wording[0] = wording[0].mb_chars.capitalize.to_s
wording
end

def authorized?(action_name, abstract_model = nil, object = nil)
object = nil if object.try :new_record?
action(action_name, abstract_model, object).try(:authorized?)
Expand Down Expand Up @@ -58,10 +50,10 @@ def wording_for(label, action = @action, abstract_model = @abstract_model, objec
object = nil unless abstract_model && object.is_a?(abstract_model.model)
action = RailsAdmin::Config::Actions.find(action.to_sym) if action.is_a?(Symbol) || action.is_a?(String)

capitalize_first_letter I18n.t(
I18n.t(
"admin.actions.#{action.i18n_key}.#{label}",
model_label: model_config && model_config.label,
model_label_plural: model_config && model_config.label_plural,
model_label: model_config&.label,
model_label_plural: model_config&.label_plural,
object_label: model_config && object.try(model_config.object_label_method),
)
end
Expand All @@ -76,7 +68,7 @@ def main_navigation

label = navigation_label || t('admin.misc.navigation')

%(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
%(<li class='dropdown-header'>#{label}</li>#{li_stack}) if li_stack.present?
end.join.html_safe
end

Expand All @@ -91,7 +83,7 @@ def root_navigation
end.join.html_safe
label ||= t('admin.misc.root_navigation')

%(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
%(<li class='dropdown-header'>#{label}</li>#{li_stack}) if li_stack.present?
end.join.html_safe
end

Expand All @@ -112,7 +104,7 @@ def navigation(nodes_stack, nodes, level = 0)
level_class = " nav-level-#{level}" if level > 0
nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
li = content_tag :li, data: {model: model_param} do
link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
link_to nav_icon + node.label_plural, url, class: "pjax#{level_class}"
end
li + navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
end.join.html_safe
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/rails_admin/form_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def field_wrapper_for(field, nested_in)
return if nested_field_association?(field, nested_in)
@template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
if field.label
label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
label(field.method_name, field.label, class: 'col-sm-2 control-label') +
(field.nested_form ? field_for(field) : input_for(field))
else
field.nested_form ? field_for(field) : input_for(field)
Expand Down
2 changes: 1 addition & 1 deletion app/views/rails_admin/main/dashboard.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- last_created = @most_recent_created[abstract_model.model.name]
- active = last_created.try(:today?)
%td
%span.show= link_to capitalize_first_letter(abstract_model.config.label_plural), index_path, class: 'pjax'
%span.show= link_to abstract_model.config.label_plural, index_path, class: 'pjax'
%td
- if last_created
= t "admin.misc.time_ago", time: time_ago_in_words(last_created), default: "#{time_ago_in_words(last_created)} #{t("admin.misc.ago")}"
Expand Down
6 changes: 3 additions & 3 deletions app/views/rails_admin/main/export.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
- polymorphic_type_column_name = @abstract_model.properties.detect {|p| field.association.foreign_type == p.name }.name
%label{for: "schema_#{list}_#{polymorphic_type_column_name}"}
= check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
= capitalize_first_letter(field.label) + " [type]"
= field.label + " [type]"
- else
%label{for: "schema_#{list}_#{field.name}"}
= check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
= capitalize_first_letter(field.label)
= field.label

- visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
- fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
Expand All @@ -49,7 +49,7 @@
.checkbox.col-sm-3
%label{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
= check_box_tag "schema[include][#{field.name}][#{list}][]", associated_model_field.name, true, { id: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}" }
= capitalize_first_letter(associated_model_field.label)
= associated_model_field.label

%fieldset
%legend
Expand Down
4 changes: 2 additions & 2 deletions app/views/rails_admin/main/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- else
- ''
%li
%a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-operator" => field.default_filter_operator, :"data-field-options" => field_options.html_safe, :"data-field-required" => field.required.to_s, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => field.try(:momentjs_format)}= capitalize_first_letter(field.label)
%a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-operator" => field.default_filter_operator, :"data-field-options" => field_options.html_safe, :"data-field-required" => field.required.to_s, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => field.try(:momentjs_format)}= field.label

%style
- properties.select{ |p| p.column_width.present? }.each do |property|
Expand Down Expand Up @@ -86,7 +86,7 @@
- if property.sortable
- sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {})
- sort_direction = (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown" if selected)
%th{class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= capitalize_first_letter(property.label)
%th{class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= property.label
- if other_right
%th.other.right.shrink= "..."
- unless frozen_columns
Expand Down
4 changes: 2 additions & 2 deletions spec/helpers/rails_admin/application_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
bc = helper.breadcrumb
expect(bc).to match(/Dashboard/) # dashboard
expect(bc).to match(/Teams/) # list
expect(bc).to match(/The avengers/) # show
expect(bc).to match(/the avengers/) # show
expect(bc).to match(/Edit/) # current (edit)
end
end
Expand Down Expand Up @@ -283,7 +283,7 @@
navigation_label 'commentable'
end
end
expect(helper.main_navigation).to match(/(dropdown\-header).*(Commentable).*(Comments)/m)
expect(helper.main_navigation).to match(/(dropdown\-header).*(commentable).*(Comments)/m)
end

it 'nests in parent model' do
Expand Down