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| -%>
<%=h entry.activity %> |
- <%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %> |
+ <%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %> |
<%= html_hours("%.2f" % entry.hours) %> |
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
|