diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/enumeration.rb | 1 | ||||
| -rw-r--r-- | app/views/enumerations/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/timelog/_report_criteria.rhtml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 400681a43..e86768724 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -23,7 +23,6 @@ class Enumeration < ActiveRecord::Base validates_presence_of :opt, :name validates_uniqueness_of :name, :scope => [:opt] validates_length_of :name, :maximum => 30 - validates_format_of :name, :with => /^[\w\s\'\-]*$/i OPTIONS = { "IPRI" => :enumeration_issue_priorities, diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 9de9bf37c..1967e5cf9 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -8,7 +8,7 @@ <table class="list"> <% enumerations.each do |enumeration| %> <tr class="<%= cycle('odd', 'even') %>"> - <td><%= link_to enumeration.name, :action => 'edit', :id => enumeration %></td> + <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td> <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td> <td style="width:15%;"> <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => enumeration, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %> diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml index 94f3d20f9..c9a1cfb45 100644 --- a/app/views/timelog/_report_criteria.rhtml +++ b/app/views/timelog/_report_criteria.rhtml @@ -3,7 +3,7 @@ <% next if hours_for_value.empty? -%> <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>"> <%= '<td></td>' * level %> -<td><%= format_criteria_value(criterias[level], value) %></td> +<td><%= h(format_criteria_value(criterias[level], value)) %></td> <%= '<td></td>' * (criterias.length - level - 1) -%> <% total = 0 -%> <% @periods.each do |period| -%> |