##// END OF EJS Templates
remove trailing white-spaces from app/helpers/custom_fields_helper.rb....
Toshi MARUYAMA -
r6582:7150f1b54d09
parent child
Show More
@@ -5,12 +5,12
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -29,7 +29,7 module CustomFieldsHelper
29 {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
29 {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
30 ]
30 ]
31 end
31 end
32
32
33 # Return custom field html tag corresponding to its format
33 # Return custom field html tag corresponding to its format
34 def custom_field_tag(name, custom_value)
34 def custom_field_tag(name, custom_value)
35 custom_field = custom_value.custom_field
35 custom_field = custom_value.custom_field
@@ -39,7 +39,7 module CustomFieldsHelper
39 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
39 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
40 case field_format.try(:edit_as)
40 case field_format.try(:edit_as)
41 when "date"
41 when "date"
42 text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
42 text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
43 calendar_for(field_id)
43 calendar_for(field_id)
44 when "text"
44 when "text"
45 text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
45 text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
@@ -47,14 +47,14 module CustomFieldsHelper
47 hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
47 hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
48 when "list"
48 when "list"
49 blank_option = custom_field.is_required? ?
49 blank_option = custom_field.is_required? ?
50 (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
50 (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
51 '<option></option>'
51 '<option></option>'
52 select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value), :id => field_id)
52 select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value), :id => field_id)
53 else
53 else
54 text_field_tag(field_name, custom_value.value, :id => field_id)
54 text_field_tag(field_name, custom_value.value, :id => field_id)
55 end
55 end
56 end
56 end
57
57
58 # Return custom field label tag
58 # Return custom field label tag
59 def custom_field_label_tag(name, custom_value)
59 def custom_field_label_tag(name, custom_value)
60 content_tag "label", h(custom_value.custom_field.name) +
60 content_tag "label", h(custom_value.custom_field.name) +
@@ -62,19 +62,19 module CustomFieldsHelper
62 :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
62 :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
63 :class => (custom_value.errors.empty? ? nil : "error" )
63 :class => (custom_value.errors.empty? ? nil : "error" )
64 end
64 end
65
65
66 # Return custom field tag with its label tag
66 # Return custom field tag with its label tag
67 def custom_field_tag_with_label(name, custom_value)
67 def custom_field_tag_with_label(name, custom_value)
68 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
68 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
69 end
69 end
70
70
71 def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil)
71 def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil)
72 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
72 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
73 field_id = "#{name}_custom_field_values_#{custom_field.id}"
73 field_id = "#{name}_custom_field_values_#{custom_field.id}"
74 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
74 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
75 case field_format.try(:edit_as)
75 case field_format.try(:edit_as)
76 when "date"
76 when "date"
77 text_field_tag(field_name, '', :id => field_id, :size => 10) +
77 text_field_tag(field_name, '', :id => field_id, :size => 10) +
78 calendar_for(field_id)
78 calendar_for(field_id)
79 when "text"
79 when "text"
80 text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%')
80 text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%')
@@ -94,7 +94,7 module CustomFieldsHelper
94 return "" unless custom_value
94 return "" unless custom_value
95 format_value(custom_value.value, custom_value.custom_field.field_format)
95 format_value(custom_value.value, custom_value.custom_field.field_format)
96 end
96 end
97
97
98 # Return a string used to display a custom value
98 # Return a string used to display a custom value
99 def format_value(value, field_format)
99 def format_value(value, field_format)
100 Redmine::CustomFieldFormat.format_value(value, field_format) # Proxy
100 Redmine::CustomFieldFormat.format_value(value, field_format) # Proxy
@@ -104,7 +104,7 module CustomFieldsHelper
104 def custom_field_formats_for_select(custom_field)
104 def custom_field_formats_for_select(custom_field)
105 Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
105 Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
106 end
106 end
107
107
108 # Renders the custom_values in api views
108 # Renders the custom_values in api views
109 def render_api_custom_values(custom_values, api)
109 def render_api_custom_values(custom_values, api)
110 api.array :custom_fields do
110 api.array :custom_fields do
General Comments 0
You need to be logged in to leave comments. Login now