From 5494979eeebe6078c8178e0d036b0be64ea23694 Mon Sep 17 00:00:00 2001 From: Nils Kenneweg Date: Fri, 14 Jun 2013 14:33:29 +0200 Subject: [PATCH] fixes bugs with html escaped links and enumeration problems. --- app/controllers/timelines/timelines_scenarios_controller.rb | 4 ++-- app/models/enumeration.rb | 2 ++ app/views/timelines/timelines_reportings/edit.html.erb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/timelines/timelines_scenarios_controller.rb b/app/controllers/timelines/timelines_scenarios_controller.rb index 8bec31ffa8..1b35108a1c 100644 --- a/app/controllers/timelines/timelines_scenarios_controller.rb +++ b/app/controllers/timelines/timelines_scenarios_controller.rb @@ -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 diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index a6fdb50140..0efacb02c2 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -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' diff --git a/app/views/timelines/timelines_reportings/edit.html.erb b/app/views/timelines/timelines_reportings/edit.html.erb index d2e3a9681d..b5480bc410 100644 --- a/app/views/timelines/timelines_reportings/edit.html.erb +++ b/app/views/timelines/timelines_reportings/edit.html.erb @@ -24,7 +24,7 @@ See doc/COPYRIGHT.rdoc for more details. :title => h(@reporting.reporting_to_project.name)) %>

<%= l('timelines.reporting_for_project.show', - :title => link_to_project(@reporting.reporting_to_project)) %> + :title => link_to_project(@reporting.reporting_to_project)).html_safe %>

<%= form_for :reporting,