jro_apps/redmine Commit - r220:8316e786672d

custom_field.possible_values is now serialized (no longer pipe separated)...

Jean-Philippe Lang -

r220:8316e786672d

parent child

Context file:

r220:8316e786672d

Collapse all files

db/migrate/022_serialize_possibles_values.rb created 644 +13 0

@@ -0,0 +1,13
	1	class SerializePossiblesValues < ActiveRecord::Migration
	2	def self.up
	3	CustomField.find(:all).each do \|field\|
	4	if field.possible_values and field.possible_values.is_a? String
	5	field.possible_values = field.possible_values.split('\|')
	6	field.save
	7	end
	8	end
	9	end
	10
	11	def self.down
	12	end
	13	end

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
               # Return custom field html tag corresponding to its format
               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
                 field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "string", "int"
                   text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 when "date"
                   text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                 when "text"
                   text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
                 when "bool"
                   check_box 'custom_value', 'value', :name => field_name, :id => field_id
                 when "list"
-                  select 'custom_value', 'value', custom_field.possible_values.split('|'), { :include_blank => true }, :name => field_name, :id => field_id
+                  select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
                 end
               end
               # Return custom field label tag
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "custom_fields_#{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(custom_value)
                 custom_field_label_tag(custom_value) + custom_field_tag(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
                 case field_format
                 when "date"
                   value.empty? ? "" : l_date(value.to_date)
                 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_field.rb +19 -2

             # 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 CustomField < ActiveRecord::Base
               has_many :custom_values, :dependent => :delete_all
+              serialize :possible_values
               FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                                 "text" => { :name => :label_text, :order => 2 },
                                 "int" => { :name => :label_integer, :order => 3 },
                                 "list" => { :name => :label_list, :order => 4 },
             			        "date" => { :name => :label_date, :order => 5 },
             			        "bool" => { :name => :label_boolean, :order => 6 }
               }.freeze
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
-              validates_presence_of :possible_values, :if => Proc.new { |field| field.field_format == "list" }
+              def initialize(attributes = nil)
+                super
+                self.possible_values ||= []
+              end
+              def before_validation
+                # remove empty values
+                self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
+              end
+              def validate
+                if self.field_format == "list"
+                  errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
+                  errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
+                end
+              end
               # to move in project_custom_field
               def self.for_all
                 find(:all, :conditions => ["is_for_all=?", true])
               end
               def type_name
                 nil
               end
             end

app/models/custom_value.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.
             class CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               belongs_to :customized, :polymorphic => true
             protected
               def validate
                 errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?
                 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.empty? 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 and value.length > 0
                 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
                 case custom_field.field_format
                 when "int"
                   errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/
                 when "date"
                   errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
                 when "list"
-                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.split('|').include? value or value.empty?
+                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
                 end
               end
             end

app/views/custom_fields/_form.rhtml +31 -6

             <%= error_messages_for 'custom_field' %>
-            <script>
+            <script type="text/javascript">
+            //<![CDATA[
             function toggle_custom_field_format() {
               format = $("custom_field_field_format");
               p_length = $("custom_field_min_length");
               p_regexp = $("custom_field_regexp");
               p_values = $("custom_field_possible_values");
               switch (format.value) {
                 case "list":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
-                  Element.show(p_values.parentNode);
+                  Element.show(p_values);
                   break;
                 case "int":
                 case "string":
                 case "text":
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
-                  Element.hide(p_values.parentNode);
+                  Element.hide(p_values);
                   break;
                 case "date":
                 case "bool":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
-                  Element.hide(p_values.parentNode);
+                  Element.hide(p_values);
                   break;
                 default:
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
-                  Element.show(p_values.parentNode);
+                  Element.show(p_values);
                   break;
               }
             }
+            function addValueField() {
+                var f = $$('p#custom_field_possible_values span');
+                p = document.getElementById("custom_field_possible_values");
+                var v = f[0].cloneNode(true);
+                v.childNodes[0].value = "";
+                p.appendChild(v);
+            }
+            function deleteValueField(e) {
+                var f = $$('p#custom_field_possible_values span');
+                if (f.length == 1) {
+                    e.parentNode.childNodes[0].value = "";
+                } else {
+                    Element.remove(e.parentNode);
+                }
+            }
+            //]]>
             </script>
             <!--[form:custom_field]-->
             <div class="box">
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();" %></p>
             <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
                <%= f.text_field :min_length, :size => 5, :no_label => true %> -
                <%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p>
             <p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
-            <p><%= f.text_area :possible_values, :rows => 5, :cols => 60 %><br>(<%=l(:text_possible_values_info)%>)</p>
+            <p id="custom_field_possible_values"><label><%= l(:field_possible_values) %> <%= image_to_function "add.png", "addValueField();return false" %></label>
+            <% (@custom_field.possible_values.to_a + [""]).each do |value| %>
+            <span><%= text_field_tag 'custom_field[possible_values][]', value, :size => 30 %> <%= image_to_function "delete.png", "deleteValueField(this);return false" %><br /></span>
+            <% end %>
+            </p>
             </div>
             <%= javascript_tag "toggle_custom_field_format();" %>
             <!--[eoform:custom_field]-->
             <div class="box">
             <% case @custom_field.type.to_s
             when "IssueCustomField" %>
                 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
                 <% for tracker in @trackers %>
                     <%= check_box_tag "tracker_ids[]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
                 <% end %>
                 </fieldset>
                 &nbsp;
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :is_for_all %></p>
             <% when "UserCustomField" %>
                 <p><%= f.check_box :is_required %></p>
             <% when "ProjectCustomField" %>
                 <p><%= f.check_box :is_required %></p>
             <% end %>
             </div>

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