Merge pull request activeadmin#4938 from Fivell/issue_4602

Fivell · web-flow · commit ab81e13c528c · 2017-04-25T12:24:16.000+03:00
Properly format boolean values using status_tag
diff --git a/lib/active_admin/view_helpers/display_helper.rb b/lib/active_admin/view_helpers/display_helper.rb
@@ -45,7 +45,7 @@ def format_attribute(resource, attr)
 
         if value.is_a?(Arbre::Element)
           value
-        elsif boolean_attr?(resource, attr)
+        elsif boolean_attr?(resource, attr, value)
           Arbre::Context.new { status_tag value }
         else
           pretty_format value
@@ -79,9 +79,14 @@ def pretty_format(object)
         end
       end
 
-      def boolean_attr?(resource, attr)
-        if resource.class.respond_to? :columns_hash
-          column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+      def boolean_attr?(resource, attr, value)
+        case value
+        when TrueClass, FalseClass
+           true
+        else
+          if resource.class.respond_to? :columns_hash
+            column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+          end
         end
       end
 
diff --git a/spec/unit/view_helpers/display_helper_spec.rb b/spec/unit/view_helpers/display_helper_spec.rb
@@ -176,5 +176,20 @@ class ThisModel
 
       expect(value.to_s).to eq "<span class=\"status_tag yes\">Yes</span>\n"
     end
+
+    it 'calls status_tag for boolean non-database values' do
+      post = Post.new
+      post.define_singleton_method(:true_method) do
+        true
+      end
+      post.define_singleton_method(:false_method) do
+        false
+      end
+      true_value = format_attribute post, :true_method
+      expect(true_value.to_s).to eq "<span class=\"status_tag yes\">Yes</span>\n"
+      false_value = format_attribute post, :false_method
+      expect(false_value.to_s).to eq "<span class=\"status_tag no\">No</span>\n"
+    end
+
   end
 end
