vidl-toolbox 0.0.4 → 0.0.5

data/lib/toolbox/default_controller.rb

@@ -267,7 +267,7 @@ module Toolbox
 
         csv_string = FasterCSV.generate do |csv|
           # Title
-          csv << field_renderers.map { |fr| fr.label }
+          csv << field_renderers.map { |fr| fr.label(false, false) }
           options[:collection].each do |rec|
             csv <<  field_renderers.map { |fr| fr.render_value(rec, false) }
           end

data/lib/toolbox/rendering.rb

@@ -29,8 +29,14 @@ module Toolbox
     # Renders the label of the widget.
     # If show_model is set to a model name, the model name of this widget
     # will be added in parenthesis if it differs to the value in show_model.
-    def label(show_model = nil)
-      @widget_config.label ? @view.send(:h, @widget_config.label) : translate_field(show_model) unless @widget_config.suppress_label
+    def label(show_model = nil, html = true)
+      unless @widget_config.suppress_label
+        if @widget_config.label
+          html ? @view.send(:h, @widget_config.label) : @widget_config.label
+        else
+          translate_field(show_model, html)
+        end
+      end
     end
 
     # Translates a column name of a model using gettext
@@ -38,7 +44,7 @@ module Toolbox
     # and appended to the column name. Ensure, that the model name is also translated
     # (gettext does not extract this automatically).
     #
-    def translate_field(show_model = nil)
+    def translate_field(show_model = nil, html = true)
       col_name = @widget_config.name.to_s
       model_name = @widget_config.model_name.classify
       a = col_name.split('.')
@@ -49,7 +55,8 @@ module Toolbox
 
       text = @view.send(:s_, model_name + '|' + col_name.humanize)
       text += ' (' + @view.send(:s_, model_name) + ')' if show_model && model_name != show_model
-      @view.send(:h, text)
+      
+      html ? @view.send(:h, text) : text
     end
 
   end

data/lib/toolbox/version.rb

@@ -1,4 +1,4 @@
 
 module Toolbox
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vidl-toolbox
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Nyffenegger