diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d9ead306..0c49e8e7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -320,7 +320,8 @@ class ProjectsController < ApplicationController @subprojects = @project.children.visible.all @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all @trackers = @project.rolled_up_trackers - + @user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id) + cond = @project.project_condition(Setting.display_subprojects_issues?) @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index db80b007..0994dcec 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -83,7 +83,7 @@ <%= textilizable @project.description %>
- <%= l(:label_create_time) %>:<%= @project.created_on %> + <%= l(:label_create_time) %>:<%= format_time(@project.created_on) %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 7b3241b2..cb770778 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -42,5 +42,9 @@ <% else %> -

<%= l(:label_project_no_activity) %>

+

+
<%=link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%> + + +
<%=link_to @user.login.to_s,user_path(@user) %> <%= l(:label_user_create_project) %> <%=link_to @project.name %> !
<%= format_time(@project.created_on) %>

<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 41b64059..e4e17306 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1344,3 +1344,4 @@ en: label_in_issues: in the issue: label_in_bids: in the call: label_in_users: in the user: + label_user_create_project: has created diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d1b9c5ee..d522f685 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1355,4 +1355,5 @@ zh: label_projects_feedback_respond: 回复 label_projects_feedback_respond_success: 回复成功 button_projects_feedback_respond: 回复 - label_projects_feedback_respond_content: 请输入回复内容 \ No newline at end of file + label_projects_feedback_respond_content: 请输入回复内容 + label_user_create_project: 创建了