active-list 4.1.6 → 4.1.7

data/VERSION

@@ -1 +1 @@
-4.1.6
+4.1.7

data/lib/active-list/columns/data_column.rb

@@ -81,6 +81,10 @@ module ActiveList
         datum = "(#{datum}.nil? ? '' : ::I18n.translate('countries.'+#{datum}))"
       elsif @name==:language and self.datatype == :string and self.limit <= 8
         datum = "(#{datum}.nil? ? '' : ::I18n.translate('languages.'+#{datum}))"
+      elsif self.table.model.respond_to?(@name) and !@options[:through]
+        if self.table.model.send(@name).respond_to?(:values)
+          datum = "(#{datum}.nil? ? '' : #{datum}.text)"
+        end
       end
       return datum
     end
@@ -90,6 +94,15 @@ module ActiveList
       @options[:datatype] || (@column ? @column.type : nil)
     end
 
+    
+    def enumerize?
+      if self.table.model.respond_to?(@name) and !@options[:through]
+        if self.table.model.send(@name).respond_to?(:values)
+          return true
+        end
+      end
+      return false
+    end
 
     def numeric?
       [:decimal, :integer, :float, :numeric].include? self.datatype

data/lib/active-list/renderers/simple_renderer.rb

@@ -117,6 +117,8 @@ module ActiveList
                 datum = "(#{datum}.nil? ? '' : ::I18n.localize(#{datum}, :currency => #{currency}))"
               elsif column.datatype == :decimal
                 datum = "(#{datum}.nil? ? '' : ::I18n.localize(#{datum}))"
+              elsif column.enumerize?
+                datum = "(#{datum}.nil? ? '' : #{datum}.text)"                
               end
               if column.options[:url].is_a?(TrueClass) and nature==:body
                 datum = "(#{datum}.blank? ? '' : link_to(#{datum}, {:controller=>:#{column.class_name.underscore.pluralize}, :action=>:show, :id=>#{column.record_expr(record)+'.id'}}))"

metadata

@@ -2,7 +2,7 @@
 name: active-list
 version: !ruby/object:Gem::Version
   version: !binary |-
-    NC4xLjY=
+    NC4xLjc=
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails