From 92792f300b3e8534a5b8b0433c128906ae0eaa59 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 22 Apr 2009 12:02:07 -0700 Subject: [PATCH] [#2279] Moved select_values_for_field to a helper. --- ...overhead_time_entry_activity_controller.rb | 23 ++----------------- app/helpers/overhead_helper.rb | 20 ++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 app/helpers/overhead_helper.rb diff --git a/app/controllers/overhead_time_entry_activity_controller.rb b/app/controllers/overhead_time_entry_activity_controller.rb index 4d67ded..cafa1b2 100644 --- a/app/controllers/overhead_time_entry_activity_controller.rb +++ b/app/controllers/overhead_time_entry_activity_controller.rb @@ -2,6 +2,8 @@ class OverheadTimeEntryActivityController < ApplicationController unloadable before_filter :require_admin + helper :overhead + include OverheadHelper def index if params[:custom_field] @@ -14,25 +16,4 @@ class OverheadTimeEntryActivityController < ApplicationController render :partial => 'values' end - - private - - def select_values_for_field(field) - return [] if field.nil? - - if field.field_format == 'list' - returning [] do |r| - field.possible_values.each do |item| - if item == 'Nil' - r << [l(:label_none), item] # Nil should use the none label - else - r << [item, item] - end - end - r - end - elsif field.field_format == 'bool' - return [[true,true],[false,false]] - end - end end diff --git a/app/helpers/overhead_helper.rb b/app/helpers/overhead_helper.rb new file mode 100644 index 0000000..d579aab --- /dev/null +++ b/app/helpers/overhead_helper.rb @@ -0,0 +1,20 @@ +module OverheadHelper + def select_values_for_field(field) + return [] if field.nil? + + if field.field_format == 'list' + returning [] do |r| + field.possible_values.each do |item| + if item == 'Nil' + r << [l(:label_none), item] # Nil should use the none label + else + r << [item, item] + end + end + r + end + elsif field.field_format == 'bool' + return [[true,true],[false,false]] + end + end +end