From c85e1401f04a52792d3a94c9689b37e319dafd96 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 12 Oct 2015 15:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E5=A4=9A=E9=A1=B5=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 19 ++++++++++++--
.../_homework_ref_resources_list.html.erb | 25 +++++++++++++++++++
app/views/users/_show_user_resource.html.erb | 2 +-
app/views/users/user_homeworks.html.erb | 14 +++++++++++
app/views/users/user_import_resource.js.erb | 2 +-
.../users/user_ref_resource_search.js.erb | 2 +-
app/views/users/user_resource_type.js.erb | 2 +-
config/routes.rb | 1 +
8 files changed, 61 insertions(+), 6 deletions(-)
create mode 100644 app/views/users/_homework_ref_resources_list.html.erb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 055c59f06..5252e5884 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -522,6 +522,7 @@ class UsersController < ApplicationController
@atta_count = @attachments.count
@atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
@offset ||= @atta_pages.offset
+ @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
#@curse_attachments_all = @all_attachments[@offset, @limit]
@attachments = paginateHelper @attachments,7
respond_to do |format|
@@ -555,6 +556,7 @@ class UsersController < ApplicationController
@atta_count = @attachments.count
@atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
@offset ||= @atta_pages.offset
+ @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
#@curse_attachments_all = @all_attachments[@offset, @limit]
@attachments = paginateHelper @attachments,7
respond_to do |format|
@@ -586,6 +588,7 @@ class UsersController < ApplicationController
@atta_count = @attachments.count
@atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
@offset ||= @atta_pages.offset
+ @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
#@curse_attachments_all = @all_attachments[@offset, @limit]
@attachments = paginateHelper @attachments,7
respond_to do |format|
@@ -596,8 +599,8 @@ class UsersController < ApplicationController
#将资源批量引入
def import_resources_to_homework
@attachments = []
- unless params[:checkbox1].nil? || params[:checkbox1].blank?
- params[:checkbox1].each do |id|
+ unless session[:seleted_resource_ids].nil? || session[:seleted_resource_ids].blank?
+ session[:seleted_resource_ids].each do |id|
atta = Attachment.find(id)
att_copy = atta.copy
att_copy.container_id = nil
@@ -608,11 +611,23 @@ class UsersController < ApplicationController
@attachments << att_copy
end
end
+ session[:seleted_resource_ids] = [] #保存后清空
respond_to do |format|
format.js
end
end
+ # ajax 用session保存选择的资源id
+ def store_selected_resource
+ session[:seleted_resource_ids] = [] if session[:seleted_resource_ids].nil?
+ if params[:save] == 'y'
+ session[:seleted_resource_ids] << params[:res_id]
+ else
+ session[:seleted_resource_ids].delete( params[:res_id])
+ end
+ render :nothing => true
+ end
+
include CoursesHelper
def user_courses
diff --git a/app/views/users/_homework_ref_resources_list.html.erb b/app/views/users/_homework_ref_resources_list.html.erb
new file mode 100644
index 000000000..356e412e7
--- /dev/null
+++ b/app/views/users/_homework_ref_resources_list.html.erb
@@ -0,0 +1,25 @@
+
+<% if attachments.nil? || attachments.empty? %>
+
+
+
+<% else %>
+ <% attachments.each do |attach| %>
+
+ <% end %>
+<% end %>
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 855f30071..6d985687c 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -51,7 +51,7 @@
<%= form_tag(import_resources_to_homework_user_path(user),:method => 'post',:remote=>'true') do %>
- <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+ <%= render :partial => 'homework_ref_resources_list' ,:locals=>{ :attachments => @attachments,:seleted_resources=>seleted_resources} %>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 7b212101c..4ae0e8341 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -7,6 +7,20 @@
homework_description_editor.html("");
$("#homework_editor").toggle();
}
+
+ // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+ function store_seleted_resource(dom){
+ console.log(dom.attr('checked'))
+ if(dom.attr('checked') == 'checked' ){
+ $.get(
+ '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+ )
+ }else {
+ $.get(
+ '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+ )
+ }
+ }