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

                 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

app/models/custom_field.rb +19 -2

@@ -17,7 +17,8
17		17
18	class CustomField < ActiveRecord::Base	18	class CustomField < ActiveRecord::Base
19	has_many :custom_values, :dependent => :delete_all	19	has_many :custom_values, :dependent => :delete_all
20		20	serialize :possible_values
		21
21	FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },	22	FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
22	"text" => { :name => :label_text, :order => 2 },	23	"text" => { :name => :label_text, :order => 2 },
23	"int" => { :name => :label_integer, :order => 3 },	24	"int" => { :name => :label_integer, :order => 3 },
@@ -30,7 +31,23 class CustomField < ActiveRecord::Base
30	validates_uniqueness_of :name	31	validates_uniqueness_of :name
31	validates_format_of :name, :with => /^[\w\s\'\-]*$/i	32	validates_format_of :name, :with => /^[\w\s\'\-]*$/i
32	validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys	33	validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
33	validates_presence_of :possible_values, :if => Proc.new { \|field\| field.field_format == "list" }	34
		35	def initialize(attributes = nil)
		36	super
		37	self.possible_values \|\|= []
		38	end
		39
		40	def before_validation
		41	# remove empty values
		42	self.possible_values = self.possible_values.collect{\|v\| v unless v.empty?}.compact
		43	end
		44
		45	def validate
		46	if self.field_format == "list"
		47	errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? \|\| self.possible_values.empty?
		48	errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
		49	end
		50	end
34		51
35	# to move in project_custom_field	52	# to move in project_custom_field
36	def self.for_all	53	def self.for_all

app/models/custom_value.rb +1 -1

                 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");
                 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]-->
                <%= 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]-->

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