##// END OF EJS Templates
Additional escaping....
Jean-Philippe Lang -
r6207:c3be706ce572
parent child
Show More
@@ -57,7 +57,7 module CustomFieldsHelper
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", custom_value.custom_field.name +
60 content_tag "label", h(custom_value.custom_field.name) +
61 (custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
61 (custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
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" )
@@ -24,7 +24,7 module QueriesHelper
24 def column_header(column)
24 def column_header(column)
25 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
25 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
26 :default_order => column.default_order) :
26 :default_order => column.default_order) :
27 content_tag('th', column.caption)
27 content_tag('th', h(column.caption))
28 end
28 end
29
29
30 def column_content(column, issue)
30 def column_content(column, issue)
@@ -205,7 +205,7 module SortHelper
205 # Add project_id to url_options
205 # Add project_id to url_options
206 url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id)
206 url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id)
207
207
208 link_to_content_update(caption, url_options, :class => css)
208 link_to_content_update(h(caption), url_options, :class => css)
209 end
209 end
210
210
211 # Returns a table header <th> tag with a sort link for the named column
211 # Returns a table header <th> tag with a sort link for the named column
@@ -14,7 +14,7
14 <a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
14 <a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
15 <ul>
15 <ul>
16 <% @statuses.each do |s| -%>
16 <% @statuses.each do |s| -%>
17 <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
17 <li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
18 :selected => (@issue && s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
18 :selected => (@issue && s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
19 <% end -%>
19 <% end -%>
20 </ul>
20 </ul>
@@ -26,7 +26,7
26 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
26 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
27 <ul>
27 <ul>
28 <% @trackers.each do |t| -%>
28 <% @trackers.each do |t| -%>
29 <li><%= context_menu_link t.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
29 <li><%= context_menu_link h(t.name), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
30 :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
30 :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
31 <% end -%>
31 <% end -%>
32 </ul>
32 </ul>
@@ -37,7 +37,7
37 <a href="#" class="submenu"><%= l(:field_priority) %></a>
37 <a href="#" class="submenu"><%= l(:field_priority) %></a>
38 <ul>
38 <ul>
39 <% @priorities.each do |p| -%>
39 <% @priorities.each do |p| -%>
40 <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
40 <li><%= context_menu_link h(p.name), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
41 :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
41 :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
42 <% end -%>
42 <% end -%>
43 </ul>
43 </ul>
@@ -62,7 +62,7
62 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
62 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
63 <ul>
63 <ul>
64 <% @assignables.each do |u| -%>
64 <% @assignables.each do |u| -%>
65 <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
65 <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
66 :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
66 :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
67 <% end -%>
67 <% end -%>
68 <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
68 <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
@@ -75,7 +75,7
75 <a href="#" class="submenu"><%= l(:field_category) %></a>
75 <a href="#" class="submenu"><%= l(:field_category) %></a>
76 <ul>
76 <ul>
77 <% @project.issue_categories.each do |u| -%>
77 <% @project.issue_categories.each do |u| -%>
78 <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
78 <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
79 :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
79 :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
80 <% end -%>
80 <% end -%>
81 <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
81 <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
@@ -82,7 +82,7 when "IssueCustomField" %>
82
82
83 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
83 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
84 <% for tracker in @trackers %>
84 <% for tracker in @trackers %>
85 <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
85 <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%=h tracker.name %>
86 <% end %>
86 <% end %>
87 <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
87 <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
88 </fieldset>
88 </fieldset>
@@ -13,7 +13,7
13 <tbody>
13 <tbody>
14 <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
14 <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
15 <tr class="<%= cycle("odd", "even") %>">
15 <tr class="<%= cycle("odd", "even") %>">
16 <td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
16 <td><%= link_to h(custom_field.name), :action => 'edit', :id => custom_field %></td>
17 <td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
17 <td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
18 <td align="center"><%= checked_image custom_field.is_required? %></td>
18 <td align="center"><%= checked_image custom_field.is_required? %></td>
19 <% if tab[:name] == 'IssueCustomField' %>
19 <% if tab[:name] == 'IssueCustomField' %>
@@ -19,7 +19,7
19 <tbody>
19 <tbody>
20 <% for status in @issue_statuses %>
20 <% for status in @issue_statuses %>
21 <tr class="<%= cycle("odd", "even") %>">
21 <tr class="<%= cycle("odd", "even") %>">
22 <td><%= link_to status.name, :action => 'edit', :id => status %></td>
22 <td><%= link_to h(status.name), :action => 'edit', :id => status %></td>
23 <% if Issue.use_status_for_done_ratio? %>
23 <% if Issue.use_status_for_done_ratio? %>
24 <td align="center"><%= h status.default_done_ratio %></td>
24 <td align="center"><%= h status.default_done_ratio %></td>
25 <% end %>
25 <% end %>
@@ -16,7 +16,7
16 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
16 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
17 <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
17 <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
18 </td>
18 </td>
19 <td class="status"><%= relation.other_issue(@issue).status.name %></td>
19 <td class="status"><%=h relation.other_issue(@issue).status.name %></td>
20 <td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
20 <td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
21 <td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
21 <td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
22 <td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
22 <td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
@@ -42,7 +42,7
42 <% @trackers.each do |tracker| %>
42 <% @trackers.each do |tracker| %>
43 <label class="floating">
43 <label class="floating">
44 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
44 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
45 <%= tracker %>
45 <%=h tracker %>
46 </label>
46 </label>
47 <% end %>
47 <% end %>
48 <%= hidden_field_tag 'project[tracker_ids][]', '' %>
48 <%= hidden_field_tag 'project[tracker_ids][]', '' %>
@@ -54,7 +54,7
54 <% @issue_custom_fields.each do |custom_field| %>
54 <% @issue_custom_fields.each do |custom_field| %>
55 <label class="floating">
55 <label class="floating">
56 <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
56 <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
57 <%= custom_field.name %>
57 <%=h custom_field.name %>
58 </label>
58 </label>
59 <% end %>
59 <% end %>
60 <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
60 <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
@@ -6,7 +6,7
6 <thead><tr>
6 <thead><tr>
7 <th style="width:25%"></th>
7 <th style="width:25%"></th>
8 <% for status in @statuses %>
8 <% for status in @statuses %>
9 <th style="width:<%= col_width %>%"><%= status.name %></th>
9 <th style="width:<%= col_width %>%"><%=h status.name %></th>
10 <% end %>
10 <% end %>
11 <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th>
11 <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th>
12 <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th>
12 <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th>
@@ -15,7 +15,7
15 <tbody>
15 <tbody>
16 <% for row in rows %>
16 <% for row in rows %>
17 <tr class="<%= cycle("odd", "even") %>">
17 <tr class="<%= cycle("odd", "even") %>">
18 <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
18 <td><%= link_to h(row.name), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
19 :set_filter => 1,
19 :set_filter => 1,
20 :subproject_id => '!*',
20 :subproject_id => '!*',
21 "#{field_name}" => row.id %></td>
21 "#{field_name}" => row.id %></td>
@@ -11,7 +11,7
11 <tbody>
11 <tbody>
12 <% for row in rows %>
12 <% for row in rows %>
13 <tr class="<%= cycle("odd", "even") %>">
13 <tr class="<%= cycle("odd", "even") %>">
14 <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
14 <td><%= link_to h(row.name), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
15 :set_filter => 1,
15 :set_filter => 1,
16 :subproject_id => '!*',
16 :subproject_id => '!*',
17 "#{field_name}" => row.id %></td>
17 "#{field_name}" => row.id %></td>
@@ -13,7 +13,7
13 <tbody>
13 <tbody>
14 <% for role in @roles %>
14 <% for role in @roles %>
15 <tr class="<%= cycle("odd", "even") %>">
15 <tr class="<%= cycle("odd", "even") %>">
16 <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, :action => 'edit', :id => role)) %></td>
16 <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), :action => 'edit', :id => role)) %></td>
17 <td align="center" style="width:15%;">
17 <td align="center" style="width:15%;">
18 <% unless role.builtin? %>
18 <% unless role.builtin? %>
19 <%= reorder_links('role', {:action => 'edit', :id => role}) %>
19 <%= reorder_links('role', {:action => 'edit', :id => role}) %>
@@ -14,7 +14,7
14 <tbody>
14 <tbody>
15 <% for tracker in @trackers %>
15 <% for tracker in @trackers %>
16 <tr class="<%= cycle("odd", "even") %>">
16 <tr class="<%= cycle("odd", "even") %>">
17 <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
17 <td><%= link_to h(tracker.name), :action => 'edit', :id => tracker %></td>
18 <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
18 <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
19 <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
19 <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
20 <td class="buttons">
20 <td class="buttons">
General Comments 0
You need to be logged in to leave comments. Login now