From 92f55e0dc159f4be2ce5adfbd7914ddb9f06335f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BA=95=E9=83=A8=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d86ce379b..6c5cbd390 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1942,7 +1942,7 @@ class UsersController < ApplicationController
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
     @flag = true
-    if  params[:send_id].present?
+    if params[:send_id].present?
       send_id  = params[:send_id]
       @ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
@@ -1989,14 +1989,14 @@ class UsersController < ApplicationController
       end
       send_ids.each do |send_id|
         quotes = 0
-        ori = Attachment.find_by_id(send_id)
+        @ori = Attachment.find_by_id(send_id)
         unless course_ids.nil?
           course_ids.each do |id|
             quotes = 0
-            next if ori.blank?
+            next if @ori.blank?
             @exist = false
             Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-              if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+              if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
                 att.created_on = Time.now
                 att.save
                 @exist = true
@@ -2004,21 +2004,21 @@ class UsersController < ApplicationController
               end
             end
             next if @exist
-            attach_copied_obj = ori.copy
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj = @ori.copy
+            attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
             attach_copied_obj.container = Course.find(id)
             attach_copied_obj.created_on = Time.now
             attach_copied_obj.author_id = User.current.id
             attach_copied_obj.is_public = 0
-            attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+            attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
             if attach_copied_obj.attachtype == nil
               attach_copied_obj.attachtype = 4
             end
             if attach_copied_obj.save
               # 更新引用次数
-              quotes = ori.quotes.to_i + 1
-              ori.update_attribute(:quotes, quotes) unless ori.nil?
-              ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+              quotes = @ori.quotes.to_i + 1
+              @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+              @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
             @save_message = attach_copied_obj.errors.full_messages
           end