diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f6cfb9a16..0f6798328 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2226,6 +2226,22 @@ module ApplicationHelper s end + # 获取issue类型 + def get_issue_type_new tracker_id + case tracker_id + when 1 + "缺陷" + when 2 + "功能" + when 3 + "支持" + when 4 + "任务" + when 5 + "周报" + end + end + def get_memo @new_memo = Memo.new @public_forum = Forum.find(1) rescue ActiveRecord::RecordNotFound diff --git a/app/views/projects/_act_issues.html.erb b/app/views/projects/_act_issues.html.erb index 903197a20..ef86c2118 100644 --- a/app/views/projects/_act_issues.html.erb +++ b/app/views/projects/_act_issues.html.erb @@ -7,11 +7,8 @@
- <% if activity.try(:author).try(:realname) == ' ' %> - <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% else %> - <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% end %> TO + <%= link_to activity.try(:author).show_name, user_path(activity.author_id), :class => "newsBlue mr15" %> + TO <%= link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
<% if User.current.logged? %> @@ -40,18 +37,8 @@
<% end %>
- <% case activity.tracker_id %> - <% when 1%> - 【缺陷】 - <% when 2%> - 【功能】 - <% when 3%> - 【支持】 - <% when 4%> - 【任务】 - <% when 5%> - 【周报】 - <% end %> + 【<%= get_issue_type_new(activity.tracker_id) %>】 + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey ml5", :target => "_blank" %> <%= get_issue_priority(activity.priority_id)[1] %> diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index 928360361..b9f3580fc 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -4,19 +4,19 @@ <% sub_path = entry.path[0] == "/" ? entry.path.sub("/", "") : entry.path %> <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path) %> <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %> - <%# latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path, @g) %> + <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path, @g) %> <% if entry.is_dir? %> - <%# 展开文件目录 %> + <%# 展开文件目录 %>   <% end %> @@ -26,49 +26,21 @@
-