From 54c849cccb9c70d0572b7871c6d0bcfe938872df Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 27 Aug 2015 11:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=B5=84=E6=BA=90=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E9=80=89=E4=BB=BB=E4=BD=95=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E5=BC=B9=E5=87=BA=E6=A1=86=E5=8F=91=E9=80=81=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 23 +++++++++++++++++--
 .../users/add_exist_file_to_course.js.erb     |  5 +++-
 .../users/add_exist_file_to_project.js.erb    |  7 ++++--
 app/views/users/user_resource.html.erb        |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a8243c5a5..2b6f2d28f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1066,10 +1066,14 @@ class UsersController < ApplicationController
 
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
+    @flag = true
    if  params[:send_id].present?
       send_id  = params[:send_id]
       ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
+      if course_ids.nil?
+        @flag = false
+      end
         unless course_ids.nil?
           course_ids.each do |id|
             next if ori.blank?
@@ -1087,9 +1091,13 @@ class UsersController < ApplicationController
         end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
+      course_ids = params[:course_ids]
+      if course_ids.nil?
+        @flag = false
+      end
       send_ids.each do |send_id|
         ori = Attachment.find_by_id(send_id)
-        course_ids = params[:course_ids]
+
         unless course_ids.nil?
           course_ids.each do |id|
             next if ori.blank?
@@ -1106,6 +1114,8 @@ class UsersController < ApplicationController
           end
         end
       end
+    else
+     @flag = false
     end
     respond_to do |format|
       format.js
@@ -1114,9 +1124,13 @@ class UsersController < ApplicationController
 
   # 添加资源到对应的项目
   def add_exist_file_to_project
+    @flag = true
     if  params[:send_id].present?
       send_id  = params[:send_id]
       project_ids = params[:projects_ids]
+      if project_ids.nil?
+        @flag = false
+      end
       ori = Attachment.find_by_id(send_id)
       unless project_ids.nil?
         project_ids.each do |project_id|
@@ -1134,8 +1148,12 @@ class UsersController < ApplicationController
       end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
+      project_ids = params[:projects_ids]
+      if project_ids.nil?
+        @flag = false
+      end
       send_ids.each do |send_id|
-        project_ids = params[:projects_ids]
+
         ori = Attachment.find_by_id(send_id)
         unless project_ids.nil?
           project_ids.each do |project_id|
@@ -1153,6 +1171,7 @@ class UsersController < ApplicationController
         end
       end
     else
+      @flag=true
     end
 
     respond_to do |format|
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index c5b9f8fbe..93c572fa0 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,2 +1,5 @@
+<% if @flag == true%>
 alert('发送成功')
-closeModal();
\ No newline at end of file
+closeModal();
+<% else%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 6ed846821..93c572fa0 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,2 +1,5 @@
-alert('发送成功');
-closeModal();
\ No newline at end of file
+<% if @flag == true%>
+alert('发送成功')
+closeModal();
+<% else%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index c36fdc293..1a45b7870 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -161,7 +161,7 @@ $(".resourcesList").mousedown(function(e) {
                    line = line.parent();
                 }
                 //将当前的元素的所有子元素的背景色改为蓝色
-                line.children().css("background-color", '#00ffff');
+                line.children().css("background-color", '#e1e1e1');
                 //将当前元素赋给 上一个对象 保存起来。
                 last_line = line;
              }