From 427553d4e5b03ef789a682928f7ed42a4c49d9bb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 5 Jun 2015 13:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E7=BC=96=E8=BE=91=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E3=80=81=E5=AD=A6=E7=94=9F=E7=BC=96=E8=BE=91=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E6=97=B6=E5=88=A0=E9=99=A4=E9=99=84=E4=BB=B6=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B2=A1=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 8 ++++----
 app/views/layouts/base_users.html.erb     | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index ec0480c19..353108dc7 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -216,13 +216,13 @@ class AttachmentsController < ApplicationController
         if @attachment.container.is_a?(News)
           format.html { redirect_to_referer_or news_path(@attachment.container) }
         elsif @attachment.container.is_a?(StudentWorksScore)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(HomeworkCommon)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(StudentWork)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(Message)
           format.html { redirect_to_referer_or new_board_message_path(@attachment.container) }
@@ -246,7 +246,7 @@ class AttachmentsController < ApplicationController
       end
 
       format.js
-    end
+  end
   end
   
   def delete_homework
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 0ebdea211..5686c9a1b 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -220,7 +220,6 @@
                                                  <% end %>
                                               <% if @user.user_extensions && @user.user_extensions.location && !@user.user_extensions.location.empty?%>
                                                 <tr>
-
                                                     <td style=" float: right" width="70px">
                                                      <span style="float: right"> <%= l(:label_location) %>：</span>
                                                     </td>