# HG changeset patch # User Chris Cannam # Date 1295517693 0 # Node ID 4272e09f4b5fd1bf93eb86fa4b3888e219810c9d # Parent ddcedb549d4e2e1d1e228c780c738f8ca5d6a0fb Allow list of managers, if more than one row, to overlap with description rather than pushing description down diff -r ddcedb549d4e -r 4272e09f4b5f app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb Thu Jan 20 10:00:51 2011 +0000 +++ b/app/helpers/application_helper.rb Thu Jan 20 10:01:33 2011 +0000 @@ -52,7 +52,7 @@ if user.is_a?(User) name = h(user.name(options[:format])) if user.active? - link_to name, :controller => 'users', :action => 'show', :id => user + link_to(name, :controller => 'users', :action => 'show', :id => user) else name end diff -r ddcedb549d4e -r 4272e09f4b5f app/helpers/projects_helper.rb --- a/app/helpers/projects_helper.rb Thu Jan 20 10:00:51 2011 +0000 +++ b/app/helpers/projects_helper.rb Thu Jan 20 10:01:33 2011 +0000 @@ -196,7 +196,7 @@ s << "" s << "" << link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") << "" - s << "" + s << "" u = project.users_by_role if u @@ -216,15 +216,14 @@ end s << "" - s << "" << format_date(project.created_on) << "" - s << "" << format_date(project.updated_on) << "" + s << "" << format_date(project.created_on) << "" + s << "" << format_date(project.updated_on) << "" s << "" s << "" s << "" s << textilizable(project.short_description, :project => project) unless project.description.blank? s << "" - s << " " s << "" ancestors << project