作业导入资源问题

app/controllers/users_controller.rb

@@ -1022,20 +1022,34 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    @user = User.current
-    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
+    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+    elsif (params[:type].blank? ||params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+    end
+    @status = params[:status]
     @type = params[:type]
     @homework_id = params[:homework_id]
-    @limit = 7
+    @limit = 10
     @is_remote = true
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     @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
+    @attachments = paginateHelper @attachments,10
     respond_to do |format|
       format.js
     end
@@ -1043,10 +1057,10 @@ class UsersController < ApplicationController
 
   #引入资源列表根据类型过滤
   def user_resource_type
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
+    # if User.current.id.to_i != params[:id].to_i
+    #   render_403
+    #   return
+    # end
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
@@ -1095,22 +1109,27 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    search = params[:search].to_s.strip.downcase
-    if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
-      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "2" #课程资源
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "6" #公共资源
-      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 7
@@ -1120,7 +1139,7 @@ class UsersController < ApplicationController
     @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
+    @attachments = paginateHelper @attachments, 7
     respond_to do |format|
       format.js
     end

app/views/users/_show_user_resource.html.erb

@@ -10,11 +10,16 @@
 //    });
 
     $(document).ready(function(){
+        <% if type == "1" %>
+        $("#my_resources_choose_homework").addClass("referenceTypeActive");
+        $("#public_resources_choose_homework").removeClass("referenceTypeActive");
+        <% else %>
         $(".referenceTypeBlock").click(function(){
             var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
             activeBlock.removeClass("referenceTypeActive");
             $(this).addClass("referenceTypeActive");
         });
+        <% end %>
     });
 
 // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
@@ -36,14 +41,12 @@ function store_seleted_resource(dom){
   </div>
   <div>
     <div class="referenceResourceType fl">
-      <a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock"  data-remote="true">课程资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock"  data-remote="true">项目资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock"  data-remote="true">用户资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock"  data-remote="true">附件</a> </div>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '6') %>" id="public_resources_choose_homework" class="referenceTypeBlock referenceTypeActive" data-remote="true">公共资源</a>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '1') %>"  id="my_resources_choose_homework"  class="referenceTypeBlock" data-remote="true">我的资源</a>
+    </div>
     <div class="fr">
       <!--<form class="referenceSearchBox">-->
-      <%=  form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
+      <%=  form_tag(user_ref_resource_search_user_path(user, :type => @type),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
         <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
         <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
       <% end %>

app/views/users/_user_homework_attachment.html.erb

@@ -70,7 +70,7 @@
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
+  <%= link_to "资源库",{:controller => 'users', :action => 'user_ref_resource_search', :id => User.current.id, :homework_id => container.id, :type => nil}, :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
   <% if defined?(has_program) && has_program %>
     <div id="program_setting" class="fl">
         <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>

app/views/users/user_import_resource.js.erb

@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
 showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();

app/views/users/user_ref_resource_search.js.erb

@@ -1,2 +1,11 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
-$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
+showModal('ajax-modal', '730px');
+$('#ajax-modal').css('height','auto').css("width","730px");
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" + "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed");
+$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
+
+$("#public_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '6') %>');
+$("#my_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '1') %>');
+