From 7150f1b54d09d734d199a7c2ca74bb3b5659e931 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 28 Aug 2011 10:10:18 +0000 Subject: [PATCH] remove trailing white-spaces from app/helpers/custom_fields_helper.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6702 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/custom_fields_helper.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index 0c5e6635d..2dd6a084f 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -5,12 +5,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -29,7 +29,7 @@ module CustomFieldsHelper {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName} ] end - + # Return custom field html tag corresponding to its format def custom_field_tag(name, custom_value) custom_field = custom_value.custom_field @@ -39,7 +39,7 @@ module CustomFieldsHelper field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format) case field_format.try(:edit_as) when "date" - text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + + text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + calendar_for(field_id) when "text" text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%') @@ -47,14 +47,14 @@ module CustomFieldsHelper hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id) when "list" blank_option = custom_field.is_required? ? - (custom_field.default_value.blank? ? "" : '') : + (custom_field.default_value.blank? ? "" : '') : '' select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value), :id => field_id) else text_field_tag(field_name, custom_value.value, :id => field_id) end end - + # Return custom field label tag def custom_field_label_tag(name, custom_value) content_tag "label", h(custom_value.custom_field.name) + @@ -62,19 +62,19 @@ module CustomFieldsHelper :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}", :class => (custom_value.errors.empty? ? nil : "error" ) end - + # Return custom field tag with its label tag def custom_field_tag_with_label(name, custom_value) custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value) end - + def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil) field_name = "#{name}[custom_field_values][#{custom_field.id}]" field_id = "#{name}_custom_field_values_#{custom_field.id}" field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format) case field_format.try(:edit_as) when "date" - text_field_tag(field_name, '', :id => field_id, :size => 10) + + text_field_tag(field_name, '', :id => field_id, :size => 10) + calendar_for(field_id) when "text" text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%') @@ -94,7 +94,7 @@ module CustomFieldsHelper return "" unless custom_value format_value(custom_value.value, custom_value.custom_field.field_format) end - + # Return a string used to display a custom value def format_value(value, field_format) Redmine::CustomFieldFormat.format_value(value, field_format) # Proxy @@ -104,7 +104,7 @@ module CustomFieldsHelper def custom_field_formats_for_select(custom_field) Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name) end - + # Renders the custom_values in api views def render_api_custom_values(custom_values, api) api.array :custom_fields do -- 2.39.5