summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-07 15:08:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-07 15:08:59 +0000
commitd446469f5d2d7c50911465c681ab7a469a2f9b24 (patch)
tree8bf7b636ee0b8daaae94c5acef63c470953762d1 /app/views
parent042da97f541824d72a60d51acd118dcf7892853e (diff)
downloadredmine-d446469f5d2d7c50911465c681ab7a469a2f9b24.tar.gz
redmine-d446469f5d2d7c50911465c681ab7a469a2f9b24.zip
Removes constraint on enumerations name (#1384).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1503 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/enumerations/list.rhtml2
-rw-r--r--app/views/timelog/_report_criteria.rhtml2
2 files changed, 2 insertions, 2 deletions
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| -%>