Skip to content

Commit 2fa86c3

Browse files
authored
Simplify uses of defined?
If an instance variable isn't defined it will always return nil.
1 parent aefbca4 commit 2fa86c3

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

app/helpers/rails_admin/application_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def navigation(parent_groups, nodes, level = 0)
122122
nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
123123
css_classes = ['nav-link']
124124
css_classes.push("nav-level-#{level}") if level > 0
125-
css_classes.push('active') if defined?(@action) && current_action?(@action, model_param)
125+
css_classes.push('active') if @action && current_action?(@action, model_param)
126126
li = content_tag :li, data: {model: model_param} do
127127
link_to nav_icon + " " + node.label_plural, url, class: css_classes.join(' ')
128128
end
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= instance_variable_defined?(:@fa_font_path) ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";
1+
<%= @fa_font_path ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";

lib/rails_admin/config/model.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ def initialize(entity)
4848
end
4949

5050
def excluded?
51-
return @excluded if defined?(@excluded)
52-
53-
@excluded = !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
51+
@excluded ||= !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
5452
end
5553

5654
def object_label

0 commit comments

Comments
 (0)