From 65c25feabb7a06a311a0104c81224bae1c21496e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 4 Jul 2014 16:00:18 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7=E6=A8=A1=E5=9D=97=E6=94=B9=E7=89=88?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- app/views/issues/_action_menu.html.erb | 2 +- app/views/issues/_list.html.erb | 7 ++++--- app/views/issues/_list_simple.html.erb | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 59d6720c7..cb925a8b1 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -44,7 +44,7 @@ <% if e.event_type == "issue" %> - <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count) %> + <%= link_to l(:label_find_all_comments), issue_path(e.id) %> <%= l(:label_comments_count, :count => e.journals.count) %> <% end %> diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index 3f87eaabd..61cea920c 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -14,5 +14,5 @@ <%= watcher_link(@issue, User.current) %> <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %> -<%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %> +<%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index dd3487258..937a3a079 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -28,11 +28,12 @@ diff --git a/app/views/issues/_list_simple.html.erb b/app/views/issues/_list_simple.html.erb index 0e4aa0731..3a33e6f5f 100644 --- a/app/views/issues/_list_simple.html.erb +++ b/app/views/issues/_list_simple.html.erb @@ -12,12 +12,12 @@ <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %> - <%= link_to issue.id, issue_path(issue) %> + <%= link_to issue.id, issue_path(issue.id) %> <%= link_to_project(issue.project) %> <%=h issue.tracker %> - <%= link_to truncate(issue.subject, :length => 60), issue_path(issue) %> (<%=h issue.status %>) + <%= link_to truncate(issue.subject, :length => 60), issue_path(issue.id) %> (<%=h issue.status %>) <% end %> From 8b389776a16f3c23dcfb6304dd0752edb4e69ab6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 4 Jul 2014 16:14:11 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=89=93=E5=BC=80=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=B9=E4=B8=BA=E4=BB=8E=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 937a3a079..b36c4b57d 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -33,7 +33,7 @@ <% a << column_content[1] %> <%# a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %> <% a << "#{issue.source_from}" << "(#{raw column_content[2]}):" << column_content[4] %> - <%= link_to a.join(' '), issue_path(issue.id), :class => "issue-link" %> + <%= link_to a.join(' '), issue_path(issue.id), :class => "issue-link" , :target =>"_blank"%> <% end -%>