diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-25 16:34:40 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-25 16:34:40 +0000 |
| commit | 73500a349ba8c312312be67aa8cd4547a5717661 (patch) | |
| tree | fcf482675bcb0c4f75b154424d4d540f4d1b83ee | |
| parent | b587f693ab6cbe251ef053039a3608fcbc1871d6 (diff) | |
| download | redmine-73500a349ba8c312312be67aa8cd4547a5717661.tar.gz redmine-73500a349ba8c312312be67aa8cd4547a5717661.zip | |
Fixed that the issue link is escaped on my page spent time (#10991).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9709 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/my/blocks/_timelog.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/my_controller_test.rb | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index 0c92ab55e..12a88ac02 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -31,7 +31,7 @@ entries_by_day = entries.group_by(&:spent_on) <% entries_by_day[day].each do |entry| -%> <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;"> <td class="activity"><%=h entry.activity %></td> - <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td> + <td class="subject"><%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td> <td class="comments"><%=h entry.comments %></td> <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td> <td align="center"> diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 4294f58e8..d7364dfa8 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -22,7 +22,8 @@ require 'my_controller' class MyController; def rescue_action(e) raise e end; end class MyControllerTest < ActionController::TestCase - fixtures :users, :user_preferences, :roles, :projects, :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources + fixtures :users, :user_preferences, :roles, :projects, :members, :member_roles, + :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources def setup @controller = MyController.new @@ -43,6 +44,20 @@ class MyControllerTest < ActionController::TestCase assert_template 'page' end + def test_page_with_timelog_block + preferences = User.find(2).pref + preferences[:my_page_layout] = {'top' => ['timelog']} + preferences.save! + TimeEntry.create!(:user => User.find(2), :spent_on => Date.yesterday, :issue_id => 1, :hours => 2.5, :activity_id => 10) + + get :page + assert_response :success + assert_select 'tr.time-entry' do + assert_select 'td.subject a[href=/issues/1]' + assert_select 'td.hours', :text => '2.50' + end + end + def test_my_account_should_show_editable_custom_fields get :account assert_response :success |