| @@ -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 | |
| @@ -34,7 +34,7 module CustomFieldsHelper | |||
|
|
34 | 34 | when "bool" |
|
|
35 | 35 | check_box 'custom_value', 'value', :name => field_name, :id => field_id |
|
|
36 | 36 | when "list" |
|
|
37 |
select 'custom_value', 'value', custom_field.possible_values |
|
|
|
37 | select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id | |
|
|
38 | 38 | end |
|
|
39 | 39 | end |
|
|
40 | 40 | |
| @@ -17,7 +17,8 | |||
|
|
17 | 17 | |
|
|
18 | 18 | class CustomField < ActiveRecord::Base |
|
|
19 | 19 | has_many :custom_values, :dependent => :delete_all |
|
|
20 | ||
|
|
20 | serialize :possible_values | |
|
|
21 | ||
|
|
21 | 22 | FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 }, |
|
|
22 | 23 | "text" => { :name => :label_text, :order => 2 }, |
|
|
23 | 24 | "int" => { :name => :label_integer, :order => 3 }, |
| @@ -30,7 +31,23 class CustomField < ActiveRecord::Base | |||
|
|
30 | 31 | validates_uniqueness_of :name |
|
|
31 | 32 | validates_format_of :name, :with => /^[\w\s\'\-]*$/i |
|
|
32 | 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 | 52 | # to move in project_custom_field |
|
|
36 | 53 | def self.for_all |
| @@ -31,7 +31,7 protected | |||
|
|
31 | 31 | when "date" |
|
|
32 | 32 | errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty? |
|
|
33 | 33 | when "list" |
|
|
34 |
errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values. |
|
|
|
34 | errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty? | |
|
|
35 | 35 | end |
|
|
36 | 36 | end |
|
|
37 | 37 | end |
| @@ -1,6 +1,7 | |||
|
|
1 | 1 | <%= error_messages_for 'custom_field' %> |
|
|
2 | 2 | |
|
|
3 | <script> | |
|
|
3 | <script type="text/javascript"> | |
|
|
4 | //<![CDATA[ | |
|
|
4 | 5 | function toggle_custom_field_format() { |
|
|
5 | 6 | format = $("custom_field_field_format"); |
|
|
6 | 7 | p_length = $("custom_field_min_length"); |
| @@ -10,28 +11,47 function toggle_custom_field_format() { | |||
|
|
10 | 11 | case "list": |
|
|
11 | 12 | Element.hide(p_length.parentNode); |
|
|
12 | 13 | Element.hide(p_regexp.parentNode); |
|
|
13 |
Element.show(p_values |
|
|
|
14 | Element.show(p_values); | |
|
|
14 | 15 | break; |
|
|
15 | 16 | case "int": |
|
|
16 | 17 | case "string": |
|
|
17 | 18 | case "text": |
|
|
18 | 19 | Element.show(p_length.parentNode); |
|
|
19 | 20 | Element.show(p_regexp.parentNode); |
|
|
20 |
Element.hide(p_values |
|
|
|
21 | Element.hide(p_values); | |
|
|
21 | 22 | break; |
|
|
22 | 23 | case "date": |
|
|
23 | 24 | case "bool": |
|
|
24 | 25 | Element.hide(p_length.parentNode); |
|
|
25 | 26 | Element.hide(p_regexp.parentNode); |
|
|
26 |
Element.hide(p_values |
|
|
|
27 | Element.hide(p_values); | |
|
|
27 | 28 | break; |
|
|
28 | 29 | default: |
|
|
29 | 30 | Element.show(p_length.parentNode); |
|
|
30 | 31 | Element.show(p_regexp.parentNode); |
|
|
31 |
Element.show(p_values |
|
|
|
32 | Element.show(p_values); | |
|
|
32 | 33 | break; |
|
|
33 | 34 | } |
|
|
34 | 35 | } |
|
|
36 | ||
|
|
37 | function addValueField() { | |
|
|
38 | var f = $$('p#custom_field_possible_values span'); | |
|
|
39 | p = document.getElementById("custom_field_possible_values"); | |
|
|
40 | var v = f[0].cloneNode(true); | |
|
|
41 | v.childNodes[0].value = ""; | |
|
|
42 | p.appendChild(v); | |
|
|
43 | } | |
|
|
44 | ||
|
|
45 | function deleteValueField(e) { | |
|
|
46 | var f = $$('p#custom_field_possible_values span'); | |
|
|
47 | if (f.length == 1) { | |
|
|
48 | e.parentNode.childNodes[0].value = ""; | |
|
|
49 | } else { | |
|
|
50 | Element.remove(e.parentNode); | |
|
|
51 | } | |
|
|
52 | } | |
|
|
53 | ||
|
|
54 | //]]> | |
|
|
35 | 55 | </script> |
|
|
36 | 56 | |
|
|
37 | 57 | <!--[form:custom_field]--> |
| @@ -42,7 +62,12 function toggle_custom_field_format() { | |||
|
|
42 | 62 | <%= f.text_field :min_length, :size => 5, :no_label => true %> - |
|
|
43 | 63 | <%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p> |
|
|
44 | 64 | <p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p> |
|
|
45 | <p><%= f.text_area :possible_values, :rows => 5, :cols => 60 %><br>(<%=l(:text_possible_values_info)%>)</p> | |
|
|
65 | <p id="custom_field_possible_values"><label><%= l(:field_possible_values) %> <%= image_to_function "add.png", "addValueField();return false" %></label> | |
|
|
66 | <% (@custom_field.possible_values.to_a + [""]).each do |value| %> | |
|
|
67 | <span><%= text_field_tag 'custom_field[possible_values][]', value, :size => 30 %> <%= image_to_function "delete.png", "deleteValueField(this);return false" %><br /></span> | |
|
|
68 | <% end %> | |
|
|
69 | ||
|
|
70 | </p> | |
|
|
46 | 71 | </div> |
|
|
47 | 72 | <%= javascript_tag "toggle_custom_field_format();" %> |
|
|
48 | 73 | <!--[eoform:custom_field]--> |
General Comments 0
You need to be logged in to leave comments.
Login now