Show all text in show view and use truncate length from column.option…

…s in list view
davec · Jun 3, 2009 · acf677b · acf677b
1 parent 23f2502
commit acf677b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/active_scaffold/helpers/list_column_helpers.rb b/lib/active_scaffold/helpers/list_column_helpers.rb
@@ -124,7 +124,7 @@ def clean_column_value(v)
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        truncate(clean_column_value(record.send(column.name)), :length => 50)
+        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
       end
 
       def active_scaffold_column_checkbox(column, record)

diff --git a/lib/active_scaffold/helpers/show_column_helpers.rb b/lib/active_scaffold/helpers/show_column_helpers.rb
@@ -22,7 +22,7 @@ def show_column_value(record, column)
       end
 
       def active_scaffold_show_text(column, record)
-        simple_format(get_column_value(record, column))
+        simple_format(clean_column_value(record.send(column.name)))
       end
 
       def show_column_override(column)