Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/users_controller.rb

@@ -405,7 +405,7 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
         user_course_ids = User.current.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")
@@ -436,7 +436,7 @@ class UsersController < ApplicationController
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
     search = params[:search].to_s.strip.downcase
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
         user_course_ids = User.current.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(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
@@ -1067,7 +1067,7 @@ class UsersController < ApplicationController
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
       Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank?|| params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.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')) "+
@@ -1129,7 +1129,7 @@ class UsersController < ApplicationController
       end
     end
 
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.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')) "+
@@ -1268,6 +1268,18 @@ class UsersController < ApplicationController
     else
      @flag = false
     end
+    user_course_ids = User.current.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")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1324,7 +1336,18 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
-
+    user_course_ids = User.current.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")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1539,7 +1562,7 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.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')) "+

app/views/users/_resources_list.html.erb

@@ -1,8 +1,8 @@
 
 <% if attachments.nil? || attachments.empty? %>
-        <p class="nodata">
-          <%= l(:label_no_data) %>
-        </p>
+        <!--<p class="nodata">-->
+          <!--<%#= l(:label_no_data) %>-->
+        <!--</p>-->
 <% else %>
     <% attachments.each do |attach| %>
     <ul class="resourcesList">

app/views/users/add_exist_file_to_course.js.erb

@@ -1,4 +1,9 @@
 <% if @flag == true%>
+$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
 closePopUp();
 <% else%>
 <% end %>

app/views/users/add_exist_file_to_project.js.erb

@@ -1,4 +1,9 @@
 <% if @flag == true%>
+$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
 closePopUp();
 <% else%>
 <% end %>

app/views/users/user_resource.html.erb

@@ -146,7 +146,7 @@
   var id; //资源id
   var sendType;  //发送到课程 1  发送到项目 2
   var lastSendType;  //保存上次发送的发送类型
-$(".resourcesList").mousedown(function(e) {
+$("#resources_list").mousedown(function(e) {
              //如果是右键的话
             if (3 == e.which) {
                  document.oncontextmenu = function() {return false;}
@@ -160,6 +160,7 @@ $(".resourcesList").mousedown(function(e) {
                  + "px; width: 80px;");
                  $("#contextMenu").show();
                 //当前光标所在的对象
+
                 var ele = document.elementFromPoint(pageX,pageY);
                 //转换为jquery对象
                 line = $(ele).parent();
@@ -208,7 +209,7 @@ $(document.body).click(function(e) {
 
         }
         //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($(".resourcesList").get(0),line.get(0))){
+        if( contains($("#resources_list").get(0),line.get(0))){
             line.children().css("background-color", 'white');
         }