fixes bugs with html escaped links and enumeration problems.

pull/188/head
Nils Kenneweg 12 years ago
parent 172c15ae1a
commit 5494979eee
  1. 4
      app/controllers/timelines/timelines_scenarios_controller.rb
  2. 2
      app/models/enumeration.rb
  3. 2
      app/views/timelines/timelines_reportings/edit.html.erb

@ -84,12 +84,12 @@ class Timelines::TimelinesScenariosController < ApplicationController
protected
def project_settings_path
url_for(:controller => 'projects', :action => 'settings', :tab => 'timelines', :id => @project)
url_for(:controller => '/projects', :action => 'settings', :tab => 'timelines', :id => @project)
end
helper_method :project_settings_path
def default_breadcrumb
[render_to_string(:inline => "<%= link_to(l(:label_settings), project_settings_path) %>"),
[render_to_string(:inline => "<%= link_to(l(:label_settings), project_settings_path) %>").html_safe,
l('timelines.scenarios')]
end
end

@ -162,3 +162,5 @@ end
require_dependency 'time_entry_activity'
require_dependency 'document_category'
require_dependency 'issue_priority'
require_dependency 'timelines/reported_project_status'
require_dependency 'timelines/planning_element_status'

@ -24,7 +24,7 @@ See doc/COPYRIGHT.rdoc for more details.
:title => h(@reporting.reporting_to_project.name)) %>
<h2>
<%= l('timelines.reporting_for_project.show',
:title => link_to_project(@reporting.reporting_to_project)) %>
:title => link_to_project(@reporting.reporting_to_project)).html_safe %>
</h2>
<%= form_for :reporting,

Loading…
Cancel
Save