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 1/3] =?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 59d6720c..cb925a8b 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -44,7 +44,7 @@
                             </td>
                             <% if e.event_type == "issue" %>
                                 <td align="right">
-                                  <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
+                                  <span> <%= link_to l(:label_find_all_comments), issue_path(e.id) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
                                 </td>
                             <% end %>
                           </tr>
diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index 3f87eaab..61cea920 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) %>
 </div>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index dd348725..937a3a07 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -28,11 +28,12 @@
 			<ul class="issue_list">
 				<% unless issue.author.nil? || issue.author.name == "Anonymous" %>
 				<ul class="list-group-item-meta">
-					<span> <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %></span><%= l(:label_post_on)%> <% a = [] %>
+					<span> <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %></span>
+                    <%= l(:label_post_on)%> <% a = [] %>
 						<% 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), :class => "issue-link" %>
+						<%= link_to a.join(' '), issue_path(issue.id), :class => "issue-link" %>
 				</ul>
 				<% end -%>
 				<ul class="list-group-item-meta">
@@ -46,7 +47,7 @@
 					<% end %>
 					<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
 					<div class="find-comment-class">
-						<span><%= link_to l(:label_find_all_comments), issue_path(issue) %></span><%= l(:label_comments_count, :count => issue.journals.all.count) %>
+						<span><%= link_to l(:label_find_all_comments), issue_path(issue.id) %></span><%= l(:label_comments_count, :count => issue.journals.all.count) %>
 					</div>
 				</ul>
 			</ul>
diff --git a/app/views/issues/_list_simple.html.erb b/app/views/issues/_list_simple.html.erb
index 0e4aa073..3a33e6f5 100644
--- a/app/views/issues/_list_simple.html.erb
+++ b/app/views/issues/_list_simple.html.erb
@@ -12,12 +12,12 @@
     <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
       <td class="id">
         <%= 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) %>
       </td>
       <td class="project"><%= link_to_project(issue.project) %></td>
       <td class="tracker"><%=h issue.tracker %></td>
       <td class="subject">
-        <%= 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 %>)
       </td>
     </tr>
     <% 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 2/3] =?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 937a3a07..b36c4b57 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"%>
 				</ul>
 				<% end -%>
 				<ul class="list-group-item-meta">

From f1b8b7caedb7fdb4317353a046156c7c1fc20faa Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 5 Jul 2014 11:20:59 +0800
Subject: [PATCH 3/3] t

---
 app/controllers/avatar_controller.rb   |  4 ++--
 app/views/avatar/_avatar_form.html.erb | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index 3b43fec9..73c1dbd9 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -25,7 +25,7 @@ class AvatarController < ApplicationController
         end      
       end
     end
-    if @temp_file && (@temp_file.size > 0)
+    if  @temp_file && (@temp_file.size > 0)
       diskfile=disk_filename(@source_type,@source_id)
       @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
       logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
@@ -55,7 +55,7 @@ class AvatarController < ApplicationController
     # saved = @avatar.save
     begin
       f = Magick::ImageList.new(diskfile)
-      width = 300.0;
+      width = 300.0
       proportion = (width/f[0].columns)
       height = (f[0].rows*proportion)
       f.resize_to_fill!(width,height)
diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb
index fc55bd2e..272397c6 100644
--- a/app/views/avatar/_avatar_form.html.erb
+++ b/app/views/avatar/_avatar_form.html.erb
@@ -42,17 +42,17 @@
     	<div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div>
     </div>
 </span>
-<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">	
-	<span><%= l(:button_upload_photo) %></span>	 
+<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
+	<span><%= l(:button_upload_photo) %></span>
 </a>
-<span class="add_avatar" style="margin-left: -55px;width: 70px">		
+<span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
       	:id => nil,
       	:class => 'file_selector',
       	:style => 'width:70px;',#added by young
       	:size => "1",
       	:multiple => false,
-      	:onchange => 'addInputAvatar(this);', 
+      	:onchange => 'addInputAvatar(this);',
       	:data => {
         	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
         	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
@@ -61,7 +61,7 @@
         	:description_placeholder => nil ,# l(:label_optional_description)
         	:source_type => source.class.to_s,
         	:source_id => source.id.to_s
-   } %> 
+   } %>
 </span>
 </div>
 <% content_for :header_tags do %>