From c947121e2b3272e299f88b65038fc3620cc9ce82 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Mar 2016 14:52:49 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 25 ++++++++++---------
 app/views/layouts/_logined_header.html.erb    |  2 +-
 .../_user_message_userfeedaback.html.erb      |  8 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ea984aa80..837c59890 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -110,8 +110,7 @@ class UsersController < ApplicationController
     elsif @user != User.current && !User.current.admin?
       return render_403
     end
-    # 初始化/更新 点击按钮时间
-    # 24小时内显示系统消息
+    # 初始化/更新 点击按钮时间, 24小时内显示系统消息
     update_onclick_time
     # 全部设为已读
     if params[:viewed] == "all"
@@ -190,17 +189,19 @@ class UsersController < ApplicationController
 
   # 消息设置为已读
   def update_message_viewed(user)
-    course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
-    forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
-    user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
-    forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
-    org_querys = OrgMessage.where("user_id=? and viewed=0", user)
     if User.current.id == @user.id
-      course_querys.update_all(:viewed => true)
-      forge_querys.update_all(:viewed => true)
-      user_querys.update_all(:viewed => true)
-      forum_querys.update_all(:viewed => true)
-      org_querys.update_all(:viewed => true)
+      course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
+      forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
+      user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
+      forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
+      org_querys = OrgMessage.where("user_id=? and viewed=0", user)
+      at_querys = AtMessage.where("user_id=? and viewed=0", user)
+      course_querys.update_all(:viewed => true) unless course_querys.nil?
+      forge_querys.update_all(:viewed => true) unless forge_querys.nil?
+      user_querys.update_all(:viewed => true) unless user_querys.nil?
+      forum_querys.update_all(:viewed => true) unless forum_querys.nil?
+      org_querys.update_all(:viewed => true) unless org_querys.nil?
+      at_querys.update_all(:viewed => true) unless at_querys.nil?
     end
   end
 
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 20239262f..c0b3002f6 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -109,7 +109,7 @@
 
   <div class="navHomepageNews">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target =>"_Blank", :title => "您的所有消息" %>
-    <% if User.current.count_new_message >0 %>
+    <% if User.current.count_new_message.to_i >0 %>
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 23a0774c3..fa308b434 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -8,10 +8,12 @@
             <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+          <li class="homepageNewsContent fl">
+            <a href="/users/<%= ma.journals_for_message.jour_id %>/user_newfeedback" class = "#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey' }" onmouseover ="message_titile_show($(this),event)" onmouseout = "message_titile_hide($(this))">
+              <%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe %></a>
+            <%#= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+                        :onmouseout => "message_titile_hide($(this))" %>
           </li>
           <div  style="display: none" class="message_title_red system_message_style" >
             <% if ma.journals_for_message.reply_id == 0 %>

From 627580a9acfad09440c0b2be77b8b4ab8a376062 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Mar 2016 16:25:39 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_userfeedaback.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index fa308b434..dc9ff49a9 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -9,9 +9,10 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl">
-            <a href="/users/<%= ma.journals_for_message.jour_id %>/user_newfeedback" class = "#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey' }" onmouseover ="message_titile_show($(this),event)" onmouseout = "message_titile_hide($(this))">
-              <%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe %></a>
-            <%#= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <!--<a href="/users/<%= ma.journals_for_message.jour_id %>/user_newfeedback" class = "#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey' }" onmouseover ="message_titile_show($(this),event)" onmouseout = "message_titile_hide($(this))">-->
+              <!--<%#= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe %>-->
+            <!--</a>-->
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
           </li>

From 1644442d2e45cef0216be5b87bbd35916fa2c478 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Mar 2016 16:41:56 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_upload_course_files.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 133b8b4d6..0a35c783c 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -25,7 +25,7 @@
           <div class="mb5">
             <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
             <div class="fl">
-              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
             </div>
             <div class="cl"></div>
           </div>

From 47ca79c3173a5864a7fe0292b122eb3179efe035 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Mar 2016 10:49:17 +0800
Subject: [PATCH 04/18] =?UTF-8?q?news=E6=B6=88=E6=81=AF=E5=B7=B2=E8=AF=BB?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 0962deb10..dbefd82cb 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -108,15 +108,11 @@ class NewsController < ApplicationController
   def show
     # 更新news对应的forge_messages的消息viewed字段
     if @project
-      query_message_news = @news.forge_messages
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =?", @news.id, User.current.id).first
     else
-      query_message_news = @news.course_messages
-    end
-    query_message_news.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =?", @news.id, User.current.id).first
     end
+    query_message_news.update_attribute(:viewed, true)
     # 更新项目新闻的评阅的消息viewed字段
     current_message_comments = @news.comments
     current_message_comments.each do |current_message_comment|

From 22ce591c36b9cc3b1157482411543f1ce31f0784 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 15 Mar 2016 15:42:20 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 128 ++++++++++--------
 .../users/_user_resource_type_filter.html.erb |  10 +-
 app/views/users/resource_search.js.erb        |  14 +-
 app/views/users/user_resource.html.erb        |  10 +-
 app/views/users/user_resource.js.erb          |   2 +-
 5 files changed, 87 insertions(+), 77 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9a005cf16..d9219d50e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2339,6 +2339,11 @@ class UsersController < ApplicationController
     attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源搜索
+  def get_public_resources_search user_course_ids, user_project_ids, order, score, search
+    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我的资源
   def get_my_resources author_id, user_course_ids, user_project_ids, order, score
     attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -2348,7 +2353,7 @@ class UsersController < ApplicationController
 
   # 获取我的资源查询结果
   def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search)
-    @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    @attachments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','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 is_publish = 1 and container_id is not null)" +
                                         "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
@@ -2360,11 +2365,23 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取公共资源课程
+  # 获取我的课程资源中搜索结果
+  def get_course_resources_search author_id, user_course_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
+                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+                               and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
     attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源中课程资源搜索结果
+  def get_course_resources_public_search user_course_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我的项目资源
   def get_project_resources author_id, user_project_ids, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
@@ -2372,25 +2389,55 @@ class UsersController < ApplicationController
                               and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的项目资源搜索
+  def get_project_resources_search author_id, user_project_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
+                                      "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
+                              and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
     attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源的项目资源搜索
+  def get_project_resources_public_search  user_project_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我上传的附件
   def get_attch_resources author_id, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
-                               'Document','Message','News','StudentWorkScore','HomewCommon')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               'Document','Message','News','StudentWorkScore','HomewCommon'))").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我上传的附件搜索结果
+  def get_attch_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
+                               'Document','Message','News','StudentWorkScore','HomewCommon')) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中我上传的附件
+  def get_attch_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
   def get_principal_resources author_id, order, score
-    attchments = Attachment.where("author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的用户类型资源搜索
+  def get_principal_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2398,6 +2445,11 @@ class UsersController < ApplicationController
     attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的用户类型资源
+  def get_principal_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
@@ -2424,14 +2476,6 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids, params[:order], @score)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids, params[:order], @score)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources(params[:id], params[:order], @score)
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources(params[:id], params[:order], @score)
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, params[:order], @score)
@@ -2585,69 +2629,39 @@ class UsersController < ApplicationController
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "desc"
     @score = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
-    switch_search = params[:search].nil? ? " " : params[:search]
-    search = "%#{switch_search.strip.downcase}%"
-    user_course_ids = User.current.courses.map { |c| c.id}
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    user_course_ids = User.current.courses.map {|c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') # 全部
       if params[:status] == "2"
-        @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 :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_course_resources_search(params[:id], user_course_ids, @order, @score, search)
       elsif params[:status] == "3"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_project_resources_search(params[:id], user_project_ids, @order, @score, search)
       elsif params[:status] == "4"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_attch_resources_search(params[:id], @order, @score, search)
       elsif params[:status] == "5"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_principal_resources_search(params[:id], @order, @score, search)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        get_my_resources_search(@user.id, user_course_ids, user_project_ids, @order, @score, search)
+        @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "2" #课程资源
-      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 = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
-                                            " and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif params[:type] == "3" # 项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif params[:type] == "4" # 附件
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif params[:type] == "5" # 用户资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif  params[:type] == "6" # 全部资源
+    elsif  params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @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 :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_course_resources_public_search(user_course_ids, @order, @score, search)
       elsif params[:status] == "3"
-        @attachments = Attachment.where("container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_project_resources_public_search(user_project_ids, @order, @score, search)
       elsif params[:status] == "4"
-        @attachments = Attachment.where("container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_attch_resources_public_search(@order, @score, search)
       elsif params[:status] == "5"
-        @attachments = Attachment.where("container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_principal_resources_public_search(@order, @score, search)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
     end
     @status = params[:status]
     @type = params[:type]
-    @type = params[:type]
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
index 9a1fad552..6e5ed51c3 100644
--- a/app/views/users/_user_resource_type_filter.html.erb
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -2,24 +2,24 @@
   <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
     <ul class="resourcesType">
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 1, :search => @switch_search) %>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 2, :search => @switch_search) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
         <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 3, :search => @switch_search) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
         <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 5, :search => @switch_search) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
         <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
       </li>
       <div id="my_files_resource">
         <% if @type != "6" %>
             <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
+              <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 4, :search => @switch_search) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
               <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
             </li>
         <% end %>
diff --git a/app/views/users/resource_search.js.erb b/app/views/users/resource_search.js.erb
index 38e80e75b..9583274c6 100644
--- a/app/views/users/resource_search.js.erb
+++ b/app/views/users/resource_search.js.erb
@@ -5,10 +5,10 @@ $("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 //更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5) %>');
-$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4) %>');
\ No newline at end of file
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ 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 cfaa0228c..80167db56 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -1,12 +1,8 @@
-<%= javascript_include_tag 'bootstrap'%>
+<%= javascript_include_tag 'bootstrap' %>
 <%= stylesheet_link_tag 'project' %>
 <%= stylesheet_link_tag 'leftside' %>
-<%= javascript_include_tag 'attachments'%>
-<!--<script type="text/css">-->
-<!--html,body{ overflow-y:scroll;}-->
-<!--html,body{ overflow:scroll; min-height:101%;}-->
-<!--html{ overflow:-moz-scrollbars-vertical;}-->
-<!--</script>-->
+<%= javascript_include_tag 'attachments' %>
+
 <script>
     function remote_get_resources(user_id,type){
 
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 8e953cac5..0ed47c01b 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -10,7 +10,7 @@ $("#res_all_count").html(<%= @atta_count %>);
 $("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
 $("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
 
-$("#resource_type_all").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 1) %>');
+$("#resource_type_all").attr('href','<%= user_resource_user_path(@user, :type => @type, :status => 1) %>');
 $("#resource_type_course").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 2) %>');
 $("#resource_type_project").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 3) %>');
 $("#resource_type_user").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 5) %>');

From a10475fa653a58ab88e6fc4db5c36c01511bab9f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 15 Mar 2016 16:28:35 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E6=96=B0=E5=BB=BA=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         | 79 +++++++++------------
 app/views/users/user_resource.js.erb        |  1 -
 app/views/users/user_resource_create.js.erb | 15 +++-
 app/views/users/user_resource_delete.js.erb | 13 +++-
 4 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d9219d50e..d1979bc84 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1549,43 +1549,39 @@ class UsersController < ApplicationController
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
     @user = User.find(params[:id])
-    #@user.save_attachments(params[:attachments],User.current)
-    # Container_type为Principal
+    # 保存文件
     attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
+    @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.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      if params[:status] == 2
-        @attachments = get_course_resources(params[:id], user_course_ids, params[:order])
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources(params[:id], user_project_ids, params[:order])
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources params[:id], params[:order]
+        @attachments = get_attch_resources(params[:id], @order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources params[:id], params[:order]
+        @attachments = get_principal_resources(params[:id], @order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, params[:order])
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids, params[:order])
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids, params[:order])
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id], params[:order]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id], params[:order]
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids, params[:order])
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids, params[:order])
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public params[:order]
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public params[:order]
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order])
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
     @status = params[:status]
@@ -1611,43 +1607,38 @@ class UsersController < ApplicationController
         Attachment.where("author_id = #{User.current.id}").delete(id)
       end
     end
+    @user = User.current
+    @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.id}
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      if params[:status] == 2
-        @attachments = get_course_resources(params[:id], user_course_ids, params[:order])
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources(params[:id], user_project_ids, params[:order])
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources params[:id], params[:order]
+        @attachments = get_attch_resources(params[:id], @order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources params[:id], params[:order]
+        @attachments = get_principal_resources(params[:id], @order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, params[:order])
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids, params[:order])
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids, params[:order])
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id], params[:order]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id], params[:order]
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids, params[:order])
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids, params[:order])
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public params[:order]
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public params[:order]
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order])
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
     @status = params[:status]
@@ -2478,13 +2469,13 @@ class UsersController < ApplicationController
       end
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids, params[:order], @score)
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids, params[:order], @score)
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public(params[:order], @score)
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public(params[:order], @score)
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 0ed47c01b..2fa0035b2 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -9,7 +9,6 @@ $("#res_all_count").html(<%= @atta_count %>);
 
 $("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
 $("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
-
 $("#resource_type_all").attr('href','<%= user_resource_user_path(@user, :type => @type, :status => 1) %>');
 $("#resource_type_course").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 2) %>');
 $("#resource_type_project").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 3) %>');
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index 5ce547fbf..e818f2870 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,6 +1,15 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-//这里不能将翻页的更新
-$("#res_all_count").html('<%=  @atta_count%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb
index e16abf28d..9583274c6 100644
--- a/app/views/users/user_resource_delete.js.erb
+++ b/app/views/users/user_resource_delete.js.erb
@@ -1,5 +1,14 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html('<%= @atta_count%>')
+$("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file

From 9aab10c05a6dbe3d2f8eef8495dc3fd7ed3dea88 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 15 Mar 2016 17:29:37 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 57 +++++++++++++++++------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d1979bc84..68accdfd0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -824,20 +824,33 @@ class UsersController < ApplicationController
     user_course_ids = User.current.courses.map { |c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type].blank? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, params[:order])
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids, params[:order])
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids, params[:order])
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id], params[:order]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id], params[:order]
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
     elsif params[:type] == "6" # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order])
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
     end
     @type = params[:type]
     @limit = 7
@@ -2503,16 +2516,19 @@ class UsersController < ApplicationController
       render_403
       return
     end
+    @user = User.find(params[:id])
+    @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.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
+    user_project_ids = User.current.projects.map {|p| p.id}    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, params[:order])
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
     elsif params[:type] == "6" # 公共资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order])
+      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
     end
+    @status = params[:status]
     @type = params[:type]
     @limit = 10
     @is_remote = true
@@ -2534,20 +2550,15 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.id}
       user_project_ids = User.current.projects.map {|p| p.id}
       # user_org_ids = User.current.organizations.map {|o| o.id}
-      @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','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 is_publish = 1 and container_id is not null)" +
-                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{params[:order].nil? ? 'created_on' : params[:order]} desc")
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
     elsif params[:type] == "6" # 公共资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order])
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 10

From 064dc81ed67671cebcf414e55802b387d2712127 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 16 Mar 2016 13:48:02 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=A0=E9=99=A4=E8=B5=84=E6=BA=90=E5=90=8E?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=AD=97=E4=B8=8D=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=EF=BC=88=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=9E=E8=B0=83=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 68accdfd0..7ba756806 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1614,10 +1614,10 @@ class UsersController < ApplicationController
   # 删除用户资源，分为批量删除 和 单个删除，只能删除自己上传的资源
   def user_resource_delete
     if params[:resource_id].present?
-      Attachment.where("author_id = #{User.current.id}").delete(params[:resource_id])
+      Attachment.where("author_id =? and id =?", User.current.id, params[:resource_id]).first.destroy
     elsif params[:checkbox1].present?
       params[:checkbox1].each do |id|
-        Attachment.where("author_id = #{User.current.id}").delete(id)
+        Attachment.where("author_id =? and id =?", User.current.id, id).first.destroy
       end
     end
     @user = User.current

From e8e96886440c92d963eb34b58a5ab6ebdff3d8c4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 16 Mar 2016 14:18:57 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=95=B0=E7=9B=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...6055201_attachment_project_count_update.rb | 19 +++++++++++++++++++
 db/schema.rb                                  | 17 +++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20160316055201_attachment_project_count_update.rb

diff --git a/db/migrate/20160316055201_attachment_project_count_update.rb b/db/migrate/20160316055201_attachment_project_count_update.rb
new file mode 100644
index 000000000..0f436aab2
--- /dev/null
+++ b/db/migrate/20160316055201_attachment_project_count_update.rb
@@ -0,0 +1,19 @@
+class AttachmentProjectCountUpdate < ActiveRecord::Migration
+  def up
+    Project.all.each do |project|
+      unless project.attachments.count.to_i == 0
+        attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{project.id} and container_type ='Project'").count
+        project_score = ProjectScore.where("project_id=?", project.id).first
+        if project_score.nil?
+          ProjectScore.create(:project_id => project.id, :attach_num => 0)
+        else
+          project_score.attach_num = attachment_count
+          project_score.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2dad292f4..33bf42b5b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160225031230) do
+ActiveRecord::Schema.define(:version => 20160316055201) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -432,9 +432,11 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.integer  "resource_num"
     t.integer  "journal_num"
     t.integer  "journal_reply_num"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at",                          :null => false
+    t.datetime "updated_at",                          :null => false
     t.integer  "total_score"
+    t.integer  "homework_journal_num", :default => 0
+    t.integer  "news_num",             :default => 0
   end
 
   create_table "course_groups", :force => true do |t|
@@ -506,6 +508,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.integer  "is_excellent",                  :default => 0
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -1282,6 +1285,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.boolean  "allow_guest_download", :default => true
+    t.integer  "visits",               :default => 0
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1441,6 +1445,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.integer  "acts_count",             :default => 0
     t.integer  "journals_count",         :default => 0
     t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -1900,6 +1905,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
     t.integer  "gid"
+    t.integer  "visits",                          :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
@@ -2013,11 +2019,6 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
 
   add_index "wikis", ["project_id"], :name => "wikis_project_id"
 
-  create_table "wlcs", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "workflows", :force => true do |t|
     t.integer "tracker_id",                  :default => 0,     :null => false
     t.integer "old_status_id",               :default => 0,     :null => false

From 0a881f14e81e7ff356465f6128abafb494f724c7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 16 Mar 2016 17:06:11 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 10 ++++--
 .../users/_import_resource_info.html.erb      | 34 ++++++-------------
 .../users/_user_import_resource_list.html.erb | 19 +++++++++++
 .../_user_import_resource_search.html.erb     | 29 ++++++++++++++++
 .../users/import_resources_search.js.erb      | 28 ++-------------
 5 files changed, 69 insertions(+), 51 deletions(-)
 create mode 100644 app/views/users/_user_import_resource_list.html.erb
 create mode 100644 app/views/users/_user_import_resource_search.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7ba756806..cf591d6a8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2544,7 +2544,11 @@ class UsersController < ApplicationController
   end
 
   def import_resources_search
-    search = "%#{params[:search].strip.downcase}%"
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:name].nil? ? " " : params[:name]
+    search = "%#{@switch_search.strip.downcase}%"
     # 别人的资源库是没有权限去看的
     if User.current.id.to_i != params[:id].to_i
       render_403
@@ -2567,10 +2571,10 @@ class UsersController < ApplicationController
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,10
+    @attachments = paginateHelper @attachments, 10
     respond_to do |format|
       format.js
-      format.html {render :layout => 'new_base'}
+      # format.html {render :layout => 'new_base'}
     end
   end
 
diff --git a/app/views/users/_import_resource_info.html.erb b/app/views/users/_import_resource_info.html.erb
index bc1152ce4..4ea56ad9f 100644
--- a/app/views/users/_import_resource_info.html.erb
+++ b/app/views/users/_import_resource_info.html.erb
@@ -26,11 +26,14 @@
       <a href="<%= import_resources_user_path(User.current, :type => '6', :subfield_file_id => params[:subfield_file_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
       <a href="<%= import_resources_user_path(User.current, :type => '1', :subfield_file_id => params[:subfield_file_id]) %>"  id="my_resources_choose" class="subject-choose fl" data-remote="true">我的资源</a>
   <% end %>
-  <%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id, :type => 1),
-                :remote => true , :method => 'get',  :id => 'resource_search_form') do %>
+  <div id="user_import_resource_search">
+    <%=render :partial=>'users/user_import_resource_search', :locals => {:type => @type, :search => ''} %>
+  </div>
+  <!--<%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id), :remote => true , :method => 'get',  :id => 'resource_search_form') do %>-->
       <!--<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />-->
-      <%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-  <%# end %>
+      <!--<%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>-->
+      <!--<%#= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none' %>-->
+  <!--<%# end %>-->
 
   <div class="cl"></div>
 
@@ -42,25 +45,10 @@
       <li class="subjectPublisher fl">上传者</li>
       <li class="fl subjectDate">上传时间</li>
     </ul>
-    <%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
-                        :mul_id => params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id],
-                        :mul_type => params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"}),
-                        :method => 'post',  :id => 'resource_import_container_form') do %>
-      <% @attachments.each do |attach| %>
-        <ul class="subjectRow">
-          <li class="subjectName fl hidden">
-            <label>
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
-            </label>
-          </li>
-          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
-          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
-        </ul>
-      <% end %>
-    <% end %>
+    <div id="import_resource_info_list">
+      <%= render :partial =>  'users/user_import_resource_list',:locals => {:project_id => params[:project_id], :subfield_file_id => params[:subfield_file_id], :course_id => params[:course_id]} %>
+    </div>
+
   </div>
 
   <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#resource_import_container_form').submit();hideModal()">选用</a></div>
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
new file mode 100644
index 000000000..57dac6ad0
--- /dev/null
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -0,0 +1,19 @@
+<%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
+                     :mul_id => project_id.nil? ? (course_id.nil? ? subfield_file_id : course_id) : project_id,
+                     :mul_type => project_id.nil? ? (course_id.nil? ? "SubfieldFile" : "Course") : "Project"}),
+                     :method => 'post',  :id => 'resource_import_container_form') do %>
+    <% @attachments.each do |attach| %>
+        <ul class="subjectRow">
+          <li class="subjectName fl hidden">
+            <label>
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+            </label>
+          </li>
+          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
+        </ul>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_import_resource_search.html.erb b/app/views/users/_user_import_resource_search.html.erb
new file mode 100644
index 000000000..b048675dd
--- /dev/null
+++ b/app/views/users/_user_import_resource_search.html.erb
@@ -0,0 +1,29 @@
+<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_hws(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id) %>'+'?name='+ e.target.value+'&type=<%=type %>',
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='search']").on('input', function (e) {
+        throttle(search_hws,window,e);
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/views/users/import_resources_search.js.erb b/app/views/users/import_resources_search.js.erb
index 549cf6329..ea527ab6b 100644
--- a/app/views/users/import_resources_search.js.erb
+++ b/app/views/users/import_resources_search.js.erb
@@ -1,25 +1,3 @@
-//$("#resources_list").html('<%#= escape_javascript( render :partial => 'users/import_resource_info' ,:locals=>{ :attachments => @attachments, :type => @type})%>');
-//$("#pages").html('<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-//$("#res_all_count").html(<%#= @atta_count%>);
-//$("#res_count").html(0);
-//$("#checkboxAll").attr('checked',false);
-
-
-<% if params[:project_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :project_id => params[:project_id]} ) %>');
-<% elsif params[:course_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :course_id => params[:course_id]} ) %>');
-<% elsif params[:subfield_file_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :subfield_file_id => params[:subfield_file_id]} ) %>');
-<% end %>
-showModal('ajax-modal', '615px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-<% if params[:project_id] %>
-$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
-<% else %>
-$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
-<% end %>
-$('#ajax-modal').parent().addClass("popbox_polls");
-
-
+$("#import_resource_info_list").html('<%= escape_javascript( render :partial => 'user_import_resource_list',
+        :locals => {:user => @user, :type => @type, :project_id => params[:project_id], :subfield_file_id => params[:subfield_file_id], :course_id => params[:course_id]} ) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');

From 7ff946e488476d01e6fc77e6b465a84c8d803d49 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 12:37:05 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E6=8F=90=E4=BE=9B=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb     |  9 ++++++
 .../_attachment_history_download.html.erb     | 31 +++++++++++++++++++
 .../attachment_history_download.js.erb        |  7 +++++
 app/views/files/_resource_detail.html.erb     | 27 +++++++++-------
 app/views/layouts/base_courses.html.erb       |  2 +-
 config/routes.rb                              |  1 +
 public/javascripts/course.js                  |  1 +
 7 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 app/views/attachments/_attachment_history_download.html.erb
 create mode 100644 app/views/attachments/attachment_history_download.js.erb

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index b878a14ac..e974f26b4 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -572,6 +572,15 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #找到文件的所有的历史版本及当前版本
+  def attachment_history_download
+    @attachment = Attachment.find(params[:id])
+    @attachment_histories = @attachment.attachment_histories
+    respond_to do |format|
+      format.js
+    end
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])
diff --git a/app/views/attachments/_attachment_history_download.html.erb b/app/views/attachments/_attachment_history_download.html.erb
new file mode 100644
index 000000000..bdef2077c
--- /dev/null
+++ b/app/views/attachments/_attachment_history_download.html.erb
@@ -0,0 +1,31 @@
+<script>
+    $(document).ready(function(){
+        $(".popupClose").click(function(){
+            $(".popupWrap").css("display","none");
+        });
+    });
+</script>
+<span class="f16 fontBlue fb">选择版本 </span>
+<p class="c_red">注：该文件有历史版本，请选择您需要的文件，点击文件名下载。</p>
+<p class="fontGrey3 mb4 fb">版本及序号</p>
+
+<div style="max-height:165px; overflow-y:auto; background-color: #e3e3e3; line-height:33px;" class="p10">
+    <span class="attachment">
+      <%= link_to truncate(@attachment.filename,length: 35, omission: '...'),
+                  download_named_attachment_path(@attachment.id, @attachment.filename),
+                  :title => @attachment.filename+"\n"+@attachment.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+    </span>
+  <span class="fr">版本号：当前</span>
+
+  <% @attachment_histories.each do |history| %>
+        <span class="attachment">
+          <%= link_to truncate(history.filename,length: 35, omission: '...'),
+                      download_history_attachment_path(history.id, history.filename),
+                      :title => history.filename+"\n"+history.description.to_s,
+                      :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+        </span>
+
+      <span class="fr">版本号：<%= history.version %></span>
+      <div class="cl"></div>
+  <% end %>
+</div>
diff --git a/app/views/attachments/attachment_history_download.js.erb b/app/views/attachments/attachment_history_download.js.erb
new file mode 100644
index 000000000..352a2ef93
--- /dev/null
+++ b/app/views/attachments/attachment_history_download.js.erb
@@ -0,0 +1,7 @@
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/attachment_history_download' )%>');
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","40%").css("left","50%");
+$('#ajax-modal').parent().addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 317bb7dd8..20ffb1e50 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -6,9 +6,17 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTitle break_word mt-4">
-        <%= link_to truncate(file.filename,length: 35, omission: '...'),
-                    download_named_attachment_path(file.id, file.filename),
-                    :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
+        <%# 如果有历史版本则提供历史版本下载 %>
+        <% if file.attachment_histories.count == 0 %>
+            <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                      download_named_attachment_path(file.id, file.filename),
+                      :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
+        <% else %>
+            <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                      :title => file.filename+"\n"+file.description.to_s,
+                      :class => "linkGrey3 f_14",
+                      :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+        <% end %>
         <%= file_preview_eye(file, class: 'preview') %>
         <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>
@@ -38,31 +46,28 @@
         <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
       </div>
       <div class="homepagePostSetting">
-
         <ul>
           <li class="homepagePostSettingIcon">
             <% if User.current.logged? %>
-
                 <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                     <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
                         <ul class="homepagePostSettiongText">
-
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                           <li><%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %></li>
                           <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
                           <% if @course.is_public? %>
                               <li>
-                                                    <span id="is_public_<%= file.id %>">
-                                                        <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
-                                                    </span>
+                                <span id="is_public_<%= file.id %>">
+                                  <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                                </span>
                               </li>
                           <%end%>
                           <li>
                             <%= link_to( '删除资源', attachment_path(file),
-                                         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
+                                     :data => {:confirm => l(:text_are_you_sure)},
+                                     :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
                           </li>
                         </ul>
-
                     <% end %>
                 <%else%>
                     <ul class="resourceSendO">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index f382a433c..7b19d2f9b 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -319,7 +319,7 @@
         }
 
     })
-
+    //资源库上传附件
     function course_files_upload(){
             $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
             showModal('ajax-modal', '513px');
diff --git a/config/routes.rb b/config/routes.rb
index bde12fa59..114fb6f96 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -876,6 +876,7 @@ RedmineApp::Application.routes.draw do
   # additional routes for having the file name at the end of url
   get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
   get 'attachments/attachment_versions/:id',:to=>'attachments#attachment_versions',:as=>'attachments_versions'
+  get 'attachments/attachment_history_download/:id',:to=>'attachments#attachment_history_download',:as=>'attachment_history_download'
   post 'attachments/upload_attachment_version',:to=>'attachments#upload_attachment_version',:as=>'upload_attachment_version'
   get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
   get 'attachments/download_history/:id/:filename', :to => 'attachments#download_history', :id => /\d+/, :filename => /.*/, :as => 'download_history_attachment'
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index fff30dec5..544c2bc33 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1432,3 +1432,4 @@ function submit_course_feedback() {
 function show_more_tool(){
     $('#navContentCourse').css('display', 'block');
 }
+

From b3faef601b4faad63fee58d7cfcd766e3f601c0b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 12:43:35 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_attachment_history_download.html.erb           | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/attachments/_attachment_history_download.html.erb b/app/views/attachments/_attachment_history_download.html.erb
index bdef2077c..c805960f0 100644
--- a/app/views/attachments/_attachment_history_download.html.erb
+++ b/app/views/attachments/_attachment_history_download.html.erb
@@ -16,15 +16,14 @@
                   :title => @attachment.filename+"\n"+@attachment.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
     </span>
   <span class="fr">版本号：当前</span>
-
+  <div class="cl"></div>
   <% @attachment_histories.each do |history| %>
-        <span class="attachment">
+      <span class="attachment">
           <%= link_to truncate(history.filename,length: 35, omission: '...'),
-                      download_history_attachment_path(history.id, history.filename),
-                      :title => history.filename+"\n"+history.description.to_s,
-                      :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
-        </span>
-
+                    download_history_attachment_path(history.id, history.filename),
+                    :title => history.filename+"\n"+history.description.to_s,
+                    :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+      </span>
       <span class="fr">版本号：<%= history.version %></span>
       <div class="cl"></div>
   <% end %>

From c8eb2d9c954b8a10cfc1c50980d5dcadb88ec1c9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 12:49:00 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_org_subfield_list.html.erb | 14 +++++++++++---
 app/views/files/_project_list.html.erb      | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 90ae3516d..b839128da 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -9,9 +9,17 @@
           </div>
           <div class="homepagePostDes">
             <div class="homepagePostTitle break_word mt-4">
-              <%= link_to file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, omission: '...'),
-                          download_named_attachment_path(file.id, file.filename),
-                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
+              <%# 如果有历史版本则提供历史版本下载 %>
+              <% if file.attachment_histories.count == 0 %>
+                  <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                              download_named_attachment_path(file.id, file.filename),
+                              :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
+              <% else %>
+                  <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                              :title => file.filename+"\n"+file.description.to_s,
+                              :class => "linkGrey3 f_14",
+                              :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+              <% end %>
               <%= file_preview_eye(file, class: 'preview') %>
               <span id="image_private_<%= file.id%>">
                 <% if file.is_public? == false%>
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index a2a1670d1..2ee726d77 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -8,9 +8,17 @@
             </div>
             <div class="homepagePostDes">
               <div class="homepagePostTitle break_word mt-4">
-                <%= link_to truncate(file.filename,length: 35, omission: '...'),
-                            download_named_attachment_path(file.id, file.filename),
-                            :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
+                <%# 如果有历史版本则提供历史版本下载 %>
+                <% if file.attachment_histories.count == 0 %>
+                    <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                                download_named_attachment_path(file.id, file.filename),
+                                :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
+                <% else %>
+                    <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                                :title => file.filename+"\n"+file.description.to_s,
+                                :class => "linkGrey3 f_14",
+                                :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+                <% end %>
                 <%= file_preview_eye(file, class: 'preview') %>
                 <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>

From ab3fc0fb2cbb6606addb6764a50b4e3afdb4c234 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 13:02:32 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=88=90=E5=91=98=E6=8F=90=E4=BE=9B?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_members.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index e82062e9b..733eacab4 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -21,7 +21,7 @@
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-              <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
+              <%= link_to_user_header member.principal, true, :class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
               <!--区分中英文角色显示的不同-->
               <% if User.current.language == "zh" %>

From 0d1fc409d1b15641506558ab6080e4cc30058283 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 13:58:55 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8C=E4=B8=80=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_repositories.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 07b2896eb..be6330d9b 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -4,6 +4,9 @@
         $("#pro_st_edit_ku").toggle();
     }
 </script>
+<% unless @project.repositories.any? %>
+    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
+<% end %>
 <%= str = error_messages_for 'repository' %>
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
@@ -87,8 +90,6 @@
       <% end %>
       </tbody>
     </table>
-<% else %>
-    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
 <% end %>
 
 

From ee40255d7edb65824fcf8dcd849aea2d867c2fea Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 14:09:13 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93bytes=E6=94=B9?=
 =?UTF-8?q?=E6=88=90b?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb            | 2 +-
 app/views/users/_user_import_resource_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index f679f9c8c..a545038f1 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -16,7 +16,7 @@
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
-          <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 57dac6ad0..af4f951e0 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -11,7 +11,7 @@
             </label>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="subjectCount fl hidden"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
           <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
         </ul>

From 84470af2ff68b41e9e9780590050900435ee9c42 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 14:47:14 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=9C=A8=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E4=B8=AD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cf591d6a8..06b2df862 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1674,10 +1674,10 @@ class UsersController < ApplicationController
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search)
-      .select { |course|  @user.allowed_to?(:as_teacher,course)}
+      .select { |course|  @user.allowed_to?(:as_teacher,course) and course.is_delete == 0 }
     else
       @course = @user.courses
-      .select { |course|  @user.allowed_to?(:as_teacher,course)}
+      .select { |course|  @user.allowed_to?(:as_teacher,course)  and course.is_delete == 0 }
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
@@ -1695,7 +1695,7 @@ class UsersController < ApplicationController
       search = "%#{params[:search].to_s.strip.downcase}%"
       @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like :p",:p=>search)
     else
-      @projects = @user.projects
+      @projects = @user.projects.visible
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id

From 03597b85ff6d88973d4030d6e77e4ee85489b43c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 16:02:36 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=A2=AB=E6=B7=B9=E6=B2=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/attachment.rb                        | 6 +++---
 app/views/projects/_project_activities.html.erb | 2 +-
 app/views/projects/show.html.erb                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 1cc0d3b7a..714da9920 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -90,8 +90,8 @@ class Attachment < ActiveRecord::Base
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
   before_save :files_to_final_location
-  after_save :act_as_course_activity
-  after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
+  after_save :act_as_course_activity,:act_as_forge_activity
+  after_create :office_conver, :be_user_score,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
   after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count, :down_course_score
 
@@ -606,7 +606,7 @@ class Attachment < ActiveRecord::Base
   # Author lizanle
   # Description 上传该项目的文档资料也要保存一份在公共表中
   def act_as_forge_activity
-    if self.container_type == 'Project'
+    if self.container_type == 'Project'  && self.forge_acts.empty?
      self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                             :project_id => self.container_id)
     end
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index c036633a5..73163521e 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -78,7 +78,7 @@
             <% end %>
             <!--Attachment   -->
         <% when "Attachment" %>
-            <%= render :partial => 'projects/attachment_acts', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <%= render :partial => 'users/course_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
             <!--<div class="problem_main">-->
               <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
 
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a58aeb281..f2b6cadeb 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -18,7 +18,7 @@
               <li><%= link_to "问题动态", {:controller => "projects", :action => "show", :type => "issue"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
               <!--<li><%#= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %></li>-->
               <li><%= link_to "新闻动态", {:controller => "projects", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey" %></li>
-              <!--<li><%#= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>-->
+              <li><%= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>
               <li><%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %></li>
               <!--<li><%#= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %></li>-->
             </ul>