jro_apps/redmine Commit - r1653:025581bb284a

Fixes boolean custom fields tags (broken by r1592) (#1640)....

Jean-Philippe Lang -

r1653:025581bb284a

parent child

Context file:

r1653:025581bb284a

Collapse all files

app/helpers/custom_fields_helper.rb +1 -1

              # redMine - project management software
              # Copyright (C) 2006  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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.
              module CustomFieldsHelper
                def custom_fields_tabs
                  tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
                          {:name => 'ProjectCustomField', :label => :label_project_plural},
                          {:name => 'UserCustomField', :label => :label_user_plural}
                          ]
                end
                # Return custom field html tag corresponding to its format
                def custom_field_tag(name, custom_value)
                  custom_field = custom_value.custom_field
                  field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
                  case custom_field.field_format
                  when "date"
                    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%')
                  when "bool"
-                   check_box_tag(field_name, custom_value.value, :id => field_id)
+                   check_box_tag(field_name, '1', custom_value.true?, :id => field_id) + hidden_field_tag(field_name, '0')
                  when "list"
                    blank_option = custom_field.is_required? ?
                                     (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
                                     '<option></option>'
                    select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, 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", custom_value.custom_field.name +
              	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
              	: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
                # Return a string used to display a custom value
                def show_value(custom_value)
                  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)
                  return "" unless value && !value.empty?
                  case field_format
                  when "date"
                    begin; format_date(value.to_date); rescue; value end
                  when "bool"
                    l_YesNo(value == "1")
                  else
                    value
                  end
                end
                # Return an array of custom field formats which can be used in select_tag
                def custom_field_formats_for_select
                  CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
                end
              end

app/models/custom_value.rb +5 0

              # redMine - project management software
              # Copyright (C) 2006  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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.
              class CustomValue < ActiveRecord::Base
                belongs_to :custom_field
                belongs_to :customized, :polymorphic => true
                def after_initialize
                  if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
                    self.value ||= custom_field.default_value
                  end
                end
+               # Returns true if the boolean custom value is true
+               def true?
+                 self.value == '1'
+               end
              protected
                def validate
                  if value.blank?
                    errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?
                  else
                    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
                    errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
                    errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
                    # Format specific validations
                    case custom_field.field_format
                    when 'int'
                      errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/
                    when 'float'
                      begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
                    when 'date'
                      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
                    when 'list'
                      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
                    end
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages