From 7f0959c9726cd623f3f3575be9fd89932b114362 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Mar 2016 15:25:22 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=AD=E6=96=87=E8=83=BD=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E8=BE=93=E5=85=A5=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B=E8=B0=83=E6=95=B4=E5=8F=91=E9=80=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=85=B6=E4=BB=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_file_form.html.erb    |  1 +
 app/views/users/_course_message_form.html.erb |  1 +
 app/views/users/_course_news_form.html.erb    |  1 +
 app/views/users/_project_file_form.html.erb   |  1 +
 .../users/_project_message_form.html.erb      | 30 +++++++++---------
 app/views/users/_project_news_form.html.erb   |  1 +
 .../users/_send_homework_to_course.html.erb   | 31 +++----------------
 .../_send_homework_to_course_form.html.erb    | 27 ++++++++++++++++
 app/views/users/choose_user_course.js.erb     |  6 +++-
 9 files changed, 57 insertions(+), 42 deletions(-)
 create mode 100644 app/views/users/_send_homework_to_course_form.html.erb

diff --git a/app/views/users/_course_file_form.html.erb b/app/views/users/_course_file_form.html.erb
index a1317c1f8..763174a29 100644
--- a/app/views/users/_course_file_form.html.erb
+++ b/app/views/users/_course_file_form.html.erb
@@ -15,6 +15,7 @@
         <% end %>
       </div>
     </div>
+    <div class="cl"></div>
     <div>
       <div class="courseSendSubmit">
         <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
diff --git a/app/views/users/_course_message_form.html.erb b/app/views/users/_course_message_form.html.erb
index 94e0f65ec..1ef69ea8f 100644
--- a/app/views/users/_course_message_form.html.erb
+++ b/app/views/users/_course_message_form.html.erb
@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
diff --git a/app/views/users/_course_news_form.html.erb b/app/views/users/_course_news_form.html.erb
index a244b8678..736802244 100644
--- a/app/views/users/_course_news_form.html.erb
+++ b/app/views/users/_course_news_form.html.erb
@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 134d837a6..837cbcc99 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
diff --git a/app/views/users/_project_message_form.html.erb b/app/views/users/_project_message_form.html.erb
index 1084142f9..635a4964e 100644
--- a/app/views/users/_project_message_form.html.erb
+++ b/app/views/users/_project_message_form.html.erb
@@ -1,25 +1,27 @@
-<%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
+<%= form_tag share_message_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
 <div>
   <%= hidden_field_tag(:send_id, send_id) %>
   <%= hidden_field_tag(:send_ids, send_ids) %>
   <div class="courseReferContainer">
-    <% if !projects.empty?  %>
+    <% if !projects.empty? %>
         <% projects.each do |project| %>
             <ul class="courseSend">
               <li class="" style="display:inline-block">
                 <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName"><%= project.name%></li>
+              <li class="sendCourseName"><%= project.name %></li>
             </ul>
         <% end %>
-        </div>
-        </div>
-        <div>
-          <div class="courseSendSubmit">
-            <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-            <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-          </div>
-          <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-        </div>
-        <div class="cl"></div>
-    <% end %>
\ No newline at end of file
+    <% end %>
+  </div>
+</div>
+<div class="cl"></div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel">
+    <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_project_news_form.html.erb b/app/views/users/_project_news_form.html.erb
index 2293f942a..38e65bdfc 100644
--- a/app/views/users/_project_news_form.html.erb
+++ b/app/views/users/_project_news_form.html.erb
@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
diff --git a/app/views/users/_send_homework_to_course.html.erb b/app/views/users/_send_homework_to_course.html.erb
index b19fbd1a8..67fd36c3c 100644
--- a/app/views/users/_send_homework_to_course.html.erb
+++ b/app/views/users/_send_homework_to_course.html.erb
@@ -1,4 +1,4 @@
-<div class="boxContainer">
+<div class="boxContainer" style="height: auto;">
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="cl"></div>
@@ -8,33 +8,9 @@
     <!--<input type="text" name="search" placeholder="输入课程ID或者名称搜索" class="subjectSearch fr" />-->
     <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入课程ID或者名称搜索" class="mt10 mb10 course-search" />
   </div>
-  <%= form_tag send_homework_to_course_user_path(user),:remote=>true,:id=>'choose_course_list_form' %>
-  <div>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+current_time_and_term(course) + ']'%></li>
-              </ul>
-          <% end %>
-    </div>
+  <div id="send_homework_to_course_form">
+    <%= render :partial => "users/send_homework_to_course_form", :locals => {:user => user, :courses => courses, :send_id => send_id} %>
   </div>
-  <div class="cl"></div>
-  <span id="choose_courses_notice" class="c_red"></span>
-  <div>
-    <div class="courseSendSubmit">
-      <a href="javascript:void(0);" onfocus='this.blur();' onclick="send_submit();" class="sendSourceText">确定</a>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a>
-    </div>
-  </div>
-  <div class="cl"></div>
-  <% end %>
 </div>
 <script type="text/javascript">
     function send_submit() {
@@ -58,6 +34,7 @@
         $.ajax({
             url: '<%= url_for(:controller => 'users', :action => 'choose_user_course') %>'+'?search='+ e.target.value+'&send_id=<%=send_id %>',
             type:'get',
+            data: {is_observe:true},
             success: function(data){  },
             beforeSend: function(){ $(this).addClass('ajax-loading'); },
             complete: function(){ $(this).removeClass('ajax-loading'); }
diff --git a/app/views/users/_send_homework_to_course_form.html.erb b/app/views/users/_send_homework_to_course_form.html.erb
new file mode 100644
index 000000000..be042556c
--- /dev/null
+++ b/app/views/users/_send_homework_to_course_form.html.erb
@@ -0,0 +1,27 @@
+<%= form_tag send_homework_to_course_user_path(user), :remote => true, :id => 'choose_course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+current_time_and_term(course) + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div class="cl"></div>
+<span id="choose_courses_notice" class="c_red"></span>
+<div>
+  <div class="courseSendSubmit">
+    <a href="javascript:void(0);" onfocus='this.blur();' onclick="send_submit();" class="sendSourceText">确定</a>
+  </div>
+  <div class="courseSendCancel">
+    <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a>
+  </div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/choose_user_course.js.erb b/app/views/users/choose_user_course.js.erb
index 508004816..64f3708f8 100644
--- a/app/views/users/choose_user_course.js.erb
+++ b/app/views/users/choose_user_course.js.erb
@@ -1,7 +1,11 @@
+<% if params[:is_observe].nil? %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');
 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","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+<% else %>
+    $("#send_homework_to_course_form").html("<%= escape_javascript(render :partial => 'users/send_homework_to_course_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>");
+<% end %>
\ No newline at end of file

From 03d855f5d584d7303c0e832f402d95c0a3b3a2ed Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 15:46:13 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_file_form.html.erb  |   3 +-
 app/views/users/_org_file_form.html.erb     |   2 +-
 app/views/users/_project_file_form.html.erb |   2 +-
 lib/redmine/pagination.rb                   | 684 ++++++++++----------
 4 files changed, 346 insertions(+), 345 deletions(-)

diff --git a/app/views/users/_course_file_form.html.erb b/app/views/users/_course_file_form.html.erb
index a1317c1f8..fa5c0a578 100644
--- a/app/views/users/_course_file_form.html.erb
+++ b/app/views/users/_course_file_form.html.erb
@@ -1,4 +1,5 @@
-<%= form_tag add_exist_file_to_course_user_path(user, :type => defined? type ? "6" : type ),:remote=>true,:id=>'course_list_form' do %>
+
+<%= form_tag add_exist_file_to_course_user_path(user, :type => defined?(type) ? type : "6" ),:remote=>true,:id=>'course_list_form' do %>
     <div>
       <%= hidden_field_tag(:send_id, send_id) %>
       <%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
index a69e71384..348a68c00 100644
--- a/app/views/users/_org_file_form.html.erb
+++ b/app/views/users/_org_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => defined? type ? "6" : type),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => defined?(type) ?  type : "6" ),:remote=>true,:id=>'orgs_list_form' do %>
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
     <div class="sectionWrap fl mr15">
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 134d837a6..fc9765209 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => defined? type ? "6" : type), :remote => true, :id => 'projects_list_form' %>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => defined?(type) ?  type : "6" ), :remote => true, :id => 'projects_list_form' %>
 <div>
   <%= hidden_field_tag(:send_id, send_id) %>
   <%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index 4f1e8ac46..79855b966 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -1,342 +1,342 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2013  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module Redmine
-  module Pagination
-    class Paginator
-      attr_reader :item_count, :per_page, :page, :page_param
-      def initialize(*args)
-        if args.first.is_a?(ActionController::Base)
-          args.shift
-          ActiveSupport::Deprecation.warn "Paginator no longer takes a controller instance as the first argument. Remove it from #new arguments."
-        end
-        item_count, per_page, page, page_param = *args
-
-        @item_count = item_count
-        @per_page = per_page
-        page = (page || 1).to_i
-        if page < 1
-        page = 1
-        end
-        @page = page
-        @page_param = page_param || :page
-      end
-
-      def offset
-        (page - 1) * per_page
-      end
-      
-      ## fq
-      def reverse_offset
-        offset = @item_count-@per_page*page
-        if offset < 0
-          offset = 0
-        end
-        offset
-      end
-      ## end 
-      
-      
-      def first_page
-        if item_count > 0
-        1
-        end
-      end
-
-      def previous_page
-        if page > 1
-          page - 1
-        end
-      end
-
-      def next_page
-        if last_item < item_count
-          page + 1
-        end
-      end
-
-      def last_page
-        if item_count > 0
-          (item_count - 1) / per_page + 1
-        end
-      end
-
-      def first_item
-        item_count == 0 ? 0 : (offset + 1)
-      end
-
-      def last_item
-        l = first_item + per_page - 1
-        l > item_count ? item_count : l
-      end
-
-      def linked_pages
-        pages = []
-        if item_count > 0
-          pages += [first_page, page, last_page]
-          pages += ((page-2)..(page+2)).to_a.select {|p| p > first_page && p < last_page}
-        end
-        pages = pages.compact.uniq.sort
-        if pages.size > 1
-        pages
-        else
-        []
-        end
-      end
-
-      def items_per_page
-        ActiveSupport::Deprecation.warn "Paginator#items_per_page will be removed. Use #per_page instead."
-        per_page
-      end
-
-      def current
-        ActiveSupport::Deprecation.warn "Paginator#current will be removed. Use .offset instead of .current.offset."
-        self
-      end
-    end
-
-    # Paginates the given scope or model. Returns a Paginator instance and
-    # the collection of objects for the current page.
-    #
-    # Options:
-    #   :parameter     name of the page parameter
-    #
-    # Examples:
-    #   @user_pages, @users = paginate User.where(:status => 1)
-    #
-    def paginate(scope, options={})
-      options = options.dup
-      finder_options = options.extract!(
-      :conditions,
-      :order,
-      :joins,
-      :include,
-      :select
-      )
-      if scope.is_a?(Symbol) || finder_options.values.compact.any?
-        return deprecated_paginate(scope, finder_options, options)
-      end
-
-      paginator = paginator(scope.count, options)
-      collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a
-
-      return paginator, collection
-    end
-
-    def deprecated_paginate(arg, finder_options, options={})
-      ActiveSupport::Deprecation.warn "#paginate with a Symbol and/or find options is depreceted and will be removed. Use a scope instead."
-      klass = arg.is_a?(Symbol) ? arg.to_s.classify.constantize : arg
-      scope = klass.scoped(finder_options)
-      paginate(scope, options)
-    end
-
-    def paginator(item_count, options={})
-      options.assert_valid_keys :parameter, :per_page
-
-      page_param = options[:parameter] || :page
-      page = (params[page_param] || 1).to_i
-      per_page = options[:per_page] || per_page_option
-      Paginator.new(item_count, per_page, page, page_param)
-    end
-
-    module Helper
-      include Redmine::I18n
-      # Renders the pagination links for the given paginator.
-      #
-      # Options:
-      #   :per_page_links    if set to false, the "Per page" links are not rendered
-      #
-      def pagination_links_full(*args)
-        page = ""
-        pagination_links_each(*args) do |text, parameters, options|
-          if block_given?
-          yield text, parameters, options
-          else
-            if args[2][:path].nil?
-              link_to text, params.merge(parameters), options
-            else
-              page = "&page" + parameters[:page].to_s unless parameters[:page].nil?
-              link_to text, args[2][:path].to_s + page, options
-            end
-          end
-        end
-      end
-
-      # Yields the given block with the text and parameters
-      # for each pagination link and returns a string that represents the links
-      # def pagination_links_each(paginator, count=nil, options={}, &block)
-      # options.assert_valid_keys :per_page_links
-      #
-      # per_page_links = options.delete(:per_page_links)
-      # per_page_links = false if count.nil?
-      # page_param = paginator.page_param
-      #
-      # html = ''
-      # if paginator.previous_page
-      # # \xc2\xab(utf-8) = &#171;
-      # text = "\xc2\xab " + l(:label_previous)
-      # html << yield(text, {page_param => paginator.previous_page}, :class => 'previous') + ' '
-      # end
-      #
-      # previous = nil
-      # paginator.linked_pages.each do |page|
-      # if previous && previous != page - 1
-      # html << content_tag('span', '...', :class => 'spacer') + ' '
-      # end
-      # if page == paginator.page
-      # html << content_tag('span', page.to_s, :class => 'current page')
-      # else
-      # html << yield(page.to_s, {page_param => page}, :class => 'page')
-      # end
-      # html << ' '
-      # previous = page
-      # end
-      #
-      # if paginator.next_page
-      # # \xc2\xbb(utf-8) = &#187;
-      # text = l(:label_next) + " \xc2\xbb"
-      # html << yield(text, {page_param => paginator.next_page}, :class => 'next') + ' '
-      # end
-      #
-      # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
-      #
-      # if per_page_links != false && links = per_page_links(paginator, &block)
-      # html << content_tag('span', links.to_s, :class => 'per-page')
-      # end
-      #
-      # html.html_safe
-      # end
-      #Added by Nie guanghui
-      #Designed for pagination.
-      def pagination_links_each(paginator, count=nil, options={}, &block)
-        #options.assert_valid_keys :per_page_links
-
-        #per_page_links = options.delete(:per_page_links)
-        per_page_links = options[:per_page_links]
-        remote = options[:remote] ? options[:remote] : false
-        flag = options[:flag] ? options[:flag] : false
-        per_page_links = false if count.nil?
-        page_param = paginator.page_param
-
-        html = ''
-        if paginator.previous_page
-          # \xc2\xab(utf-8) = &#171;
-          if flag
-            text = l(:label_previous)
-          else
-            text = "\xc2\xab " + l(:label_previous)
-          end
-          html << '<li>' <<  yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
-        end
-        unless paginator.previous_page
-          if paginator.next_page
-            if flag
-              text = l(:label_previous)
-            else
-              text = "\xc2\xab " + l(:label_previous)
-            end
-            html << '<li>' <<  yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
-          end
-        end
-
-        previous = nil
-        paginator.linked_pages.each do |page|
-          if previous && previous != page - 1
-            if flag
-              html << '<li>' << content_tag('a', '...', :class => 'c_blue') << '</li>' + ' '
-            else
-              html << '<li>' << content_tag('span', '...', :class => 'spacer ') << '</li>' + ' '
-            end
-          end
-          if page == paginator.page
-            if flag
-              html << '<li class = "wlist_select">' <<  content_tag('a', page.to_s, :class => 'current-page c_white')  << '</li>'
-            else
-              html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>'
-            end
-          else
-            html << '<li>' << yield(page.to_s, {page_param => page}, :class => 'page c_blue', :remote => remote) << '</li>'
-          end
-          html << ' '
-          previous = page
-        end
-
-        if paginator.next_page
-          if flag
-            text = l(:label_next)
-          else
-            text = l(:label_next) + " \xc2\xbb"
-          end
-          html <<  '<li>' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << '</li>' + ' '
-        end
-
-        unless paginator.next_page
-          if paginator.previous_page
-            if flag
-              text = l(:label_next)
-            else
-              text = l(:label_next) + " \xc2\xbb"
-            end
-            html <<  "<li>" <<  yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << "</li>" + ' '
-          end
-        end
-
-        # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
-        #
-        # if per_page_links != false && links = per_page_links(paginator, &block)
-        # html << content_tag('span', links.to_s, :class => 'per-page')
-        # end
-
-        html.html_safe
-      end
-
-      # Renders the "Per page" links.
-      def per_page_links(paginator, &block)
-        values = per_page_options(paginator.per_page, paginator.item_count)
-        if values.any?
-          links = values.collect do |n|
-            if n == paginator.per_page
-              content_tag('span', n.to_s)
-            else
-              yield(n, :per_page => n, paginator.page_param => nil)
-            end
-          end
-          l(:label_display_per_page, links.join(', ')).html_safe
-        end
-      end
-
-      def per_page_options(selected=nil, item_count=nil)
-        options = Setting.per_page_options_array
-        if item_count && options.any?
-          if item_count > options.first
-            max = options.detect {|value| value >= item_count} || item_count
-          else
-          max = item_count
-          end
-          options = options.select {|value| value <= max || value == selected}
-        end
-        if options.empty? || (options.size == 1 && options.first == selected)
-        []
-        else
-        options
-        end
-      end
-    end
-  end
-end
+# encoding: utf-8
+#
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module Redmine
+  module Pagination
+    class Paginator
+      attr_reader :item_count, :per_page, :page, :page_param
+      def initialize(*args)
+        if args.first.is_a?(ActionController::Base)
+          args.shift
+          ActiveSupport::Deprecation.warn "Paginator no longer takes a controller instance as the first argument. Remove it from #new arguments."
+        end
+        item_count, per_page, page, page_param = *args
+
+        @item_count = item_count
+        @per_page = per_page
+        page = (page || 1).to_i
+        if page < 1
+        page = 1
+        end
+        @page = page
+        @page_param = page_param || :page
+      end
+
+      def offset
+        (page - 1) * per_page
+      end
+      
+      ## fq
+      def reverse_offset
+        offset = @item_count-@per_page*page
+        if offset < 0
+          offset = 0
+        end
+        offset
+      end
+      ## end 
+      
+      
+      def first_page
+        if item_count > 0
+        1
+        end
+      end
+
+      def previous_page
+        if page > 1
+          page - 1
+        end
+      end
+
+      def next_page
+        if last_item < item_count
+          page + 1
+        end
+      end
+
+      def last_page
+        if item_count > 0
+          (item_count - 1) / per_page + 1
+        end
+      end
+
+      def first_item
+        item_count == 0 ? 0 : (offset + 1)
+      end
+
+      def last_item
+        l = first_item + per_page - 1
+        l > item_count ? item_count : l
+      end
+
+      def linked_pages
+        pages = []
+        if item_count > 0
+          pages += [first_page, page, last_page]
+          pages += ((page-2)..(page+2)).to_a.select {|p| p > first_page && p < last_page}
+        end
+        pages = pages.compact.uniq.sort
+        if pages.size > 1
+        pages
+        else
+        []
+        end
+      end
+
+      def items_per_page
+        ActiveSupport::Deprecation.warn "Paginator#items_per_page will be removed. Use #per_page instead."
+        per_page
+      end
+
+      def current
+        ActiveSupport::Deprecation.warn "Paginator#current will be removed. Use .offset instead of .current.offset."
+        self
+      end
+    end
+
+    # Paginates the given scope or model. Returns a Paginator instance and
+    # the collection of objects for the current page.
+    #
+    # Options:
+    #   :parameter     name of the page parameter
+    #
+    # Examples:
+    #   @user_pages, @users = paginate User.where(:status => 1)
+    #
+    def paginate(scope, options={})
+      options = options.dup
+      finder_options = options.extract!(
+      :conditions,
+      :order,
+      :joins,
+      :include,
+      :select
+      )
+      if scope.is_a?(Symbol) || finder_options.values.compact.any?
+        return deprecated_paginate(scope, finder_options, options)
+      end
+
+      paginator = paginator(scope.count, options)
+      collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a
+
+      return paginator, collection
+    end
+
+    def deprecated_paginate(arg, finder_options, options={})
+      ActiveSupport::Deprecation.warn "#paginate with a Symbol and/or find options is depreceted and will be removed. Use a scope instead."
+      klass = arg.is_a?(Symbol) ? arg.to_s.classify.constantize : arg
+      scope = klass.scoped(finder_options)
+      paginate(scope, options)
+    end
+
+    def paginator(item_count, options={})
+      options.assert_valid_keys :parameter, :per_page
+
+      page_param = options[:parameter] || :page
+      page = (params[page_param] || 1).to_i
+      per_page = options[:per_page] || per_page_option
+      Paginator.new(item_count, per_page, page, page_param)
+    end
+
+    module Helper
+      include Redmine::I18n
+      # Renders the pagination links for the given paginator.
+      #
+      # Options:
+      #   :per_page_links    if set to false, the "Per page" links are not rendered
+      #
+      def pagination_links_full(*args)
+        page = ""
+        pagination_links_each(*args) do |text, parameters, options|
+          if block_given?
+          yield text, parameters, options
+          else
+            if args[2][:path].nil?
+              link_to text, params.merge(parameters), options
+            else
+              page = "&page=" + parameters[:page].to_s unless parameters[:page].nil?
+              link_to text, args[2][:path].to_s + page, options
+            end
+          end
+        end
+      end
+
+      # Yields the given block with the text and parameters
+      # for each pagination link and returns a string that represents the links
+      # def pagination_links_each(paginator, count=nil, options={}, &block)
+      # options.assert_valid_keys :per_page_links
+      #
+      # per_page_links = options.delete(:per_page_links)
+      # per_page_links = false if count.nil?
+      # page_param = paginator.page_param
+      #
+      # html = ''
+      # if paginator.previous_page
+      # # \xc2\xab(utf-8) = &#171;
+      # text = "\xc2\xab " + l(:label_previous)
+      # html << yield(text, {page_param => paginator.previous_page}, :class => 'previous') + ' '
+      # end
+      #
+      # previous = nil
+      # paginator.linked_pages.each do |page|
+      # if previous && previous != page - 1
+      # html << content_tag('span', '...', :class => 'spacer') + ' '
+      # end
+      # if page == paginator.page
+      # html << content_tag('span', page.to_s, :class => 'current page')
+      # else
+      # html << yield(page.to_s, {page_param => page}, :class => 'page')
+      # end
+      # html << ' '
+      # previous = page
+      # end
+      #
+      # if paginator.next_page
+      # # \xc2\xbb(utf-8) = &#187;
+      # text = l(:label_next) + " \xc2\xbb"
+      # html << yield(text, {page_param => paginator.next_page}, :class => 'next') + ' '
+      # end
+      #
+      # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
+      #
+      # if per_page_links != false && links = per_page_links(paginator, &block)
+      # html << content_tag('span', links.to_s, :class => 'per-page')
+      # end
+      #
+      # html.html_safe
+      # end
+      #Added by Nie guanghui
+      #Designed for pagination.
+      def pagination_links_each(paginator, count=nil, options={}, &block)
+        #options.assert_valid_keys :per_page_links
+
+        #per_page_links = options.delete(:per_page_links)
+        per_page_links = options[:per_page_links]
+        remote = options[:remote] ? options[:remote] : false
+        flag = options[:flag] ? options[:flag] : false
+        per_page_links = false if count.nil?
+        page_param = paginator.page_param
+
+        html = ''
+        if paginator.previous_page
+          # \xc2\xab(utf-8) = &#171;
+          if flag
+            text = l(:label_previous)
+          else
+            text = "\xc2\xab " + l(:label_previous)
+          end
+          html << '<li>' <<  yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
+        end
+        unless paginator.previous_page
+          if paginator.next_page
+            if flag
+              text = l(:label_previous)
+            else
+              text = "\xc2\xab " + l(:label_previous)
+            end
+            html << '<li>' <<  yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
+          end
+        end
+
+        previous = nil
+        paginator.linked_pages.each do |page|
+          if previous && previous != page - 1
+            if flag
+              html << '<li>' << content_tag('a', '...', :class => 'c_blue') << '</li>' + ' '
+            else
+              html << '<li>' << content_tag('span', '...', :class => 'spacer ') << '</li>' + ' '
+            end
+          end
+          if page == paginator.page
+            if flag
+              html << '<li class = "wlist_select">' <<  content_tag('a', page.to_s, :class => 'current-page c_white')  << '</li>'
+            else
+              html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>'
+            end
+          else
+            html << '<li>' << yield(page.to_s, {page_param => page}, :class => 'page c_blue', :remote => remote) << '</li>'
+          end
+          html << ' '
+          previous = page
+        end
+
+        if paginator.next_page
+          if flag
+            text = l(:label_next)
+          else
+            text = l(:label_next) + " \xc2\xbb"
+          end
+          html <<  '<li>' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << '</li>' + ' '
+        end
+
+        unless paginator.next_page
+          if paginator.previous_page
+            if flag
+              text = l(:label_next)
+            else
+              text = l(:label_next) + " \xc2\xbb"
+            end
+            html <<  "<li>" <<  yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << "</li>" + ' '
+          end
+        end
+
+        # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
+        #
+        # if per_page_links != false && links = per_page_links(paginator, &block)
+        # html << content_tag('span', links.to_s, :class => 'per-page')
+        # end
+
+        html.html_safe
+      end
+
+      # Renders the "Per page" links.
+      def per_page_links(paginator, &block)
+        values = per_page_options(paginator.per_page, paginator.item_count)
+        if values.any?
+          links = values.collect do |n|
+            if n == paginator.per_page
+              content_tag('span', n.to_s)
+            else
+              yield(n, :per_page => n, paginator.page_param => nil)
+            end
+          end
+          l(:label_display_per_page, links.join(', ')).html_safe
+        end
+      end
+
+      def per_page_options(selected=nil, item_count=nil)
+        options = Setting.per_page_options_array
+        if item_count && options.any?
+          if item_count > options.first
+            max = options.detect {|value| value >= item_count} || item_count
+          else
+          max = item_count
+          end
+          options = options.select {|value| value <= max || value == selected}
+        end
+        if options.empty? || (options.size == 1 && options.first == selected)
+        []
+        else
+        options
+        end
+      end
+    end
+  end
+end

From 9e599da3655f190ee81af9dacfc27d0eb5daf897 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Mar 2016 15:47:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0045b0ce3..9c3afd48b 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1221,3 +1221,20 @@ function clear_data(k,mdu){
         $("#e_tip").html("");
     }
 }
+
+function expand_reply(container,btnid){
+  var target = $(container);
+  var btn = $(btnid);
+  if(btn.data('init')=='0'){
+    btn.data('init',1);
+    btn.html('收起回复');
+    target.show();
+  }else{
+    btn.data('init',0);
+    btn.html('展开更多');
+    target.hide();
+    target.eq(0).show();
+    target.eq(1).show();
+    target.eq(2).show();
+  }
+}

From ef5d8abf387f75fe51e96567814fce827d5456c2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 29 Mar 2016 15:54:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E7=A4=BA=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb        | 5 ++---
 app/views/users/new_user_commit_homework.html.erb | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index ae33ccb07..32867090c 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -103,11 +103,10 @@ class StudentWorkController < ApplicationController
           if result["status"].to_i != -2
             #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
             #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
+            space_replace_1(result["results"].first['output'])
+            space_replace_1(result["results"].first['result'])
           end
 
-          space_replace_1(result["results"].first['output'])
-          space_replace_1(result["results"].first['result'])
-
           logger.debug  result
 
           #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index e33362a0a..f8635194d 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -133,7 +133,6 @@
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
-              <% logger.error("################################################{test.results}") %>
               <% test.results.reverse.each_with_index do |x, i| %>
                 <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>

From 74d8dffc1481334e4bc0450d0ff0e778cddf555c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Mar 2016 16:07:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 4 ++--
 public/stylesheets/public.css   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 9e1679cb1..4558437a2 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -497,7 +497,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.boxContainer {height:33px; line-height:33px; position:relative}
+.boxContainer {height:auto; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
@@ -1482,7 +1482,7 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 .subject-list-count {width:60px; text-align:center;}
 .subject-list-from {width:145px; text-align:center;}
 
-/*视频播放默认图标*/
+/*视频播放默认图标*/
 .mediaIco{margin: 30px 0 30px 20px;width: 200px;}
 a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;}
 a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4ac37782a..1834dec12 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -450,7 +450,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.boxContainer {height:33px; line-height:33px; position:relative}
+.boxContainer {height:auto; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}

From 200561da92d7ac8efde9c05a5e4d75bc579b9ff3 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 16:43:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E8=B5=84=E6=BA=90=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E6=98=BE=E7=A4=BA=E3=80=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index efe968d3b..2d1402ed5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1820,9 +1820,38 @@ class UsersController < ApplicationController
     else
       @flag = false
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} 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(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      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" # 公共资源
+      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 = 25
     @path = user_resource_user_path(User.current, :type => @type)
@@ -1932,9 +1961,39 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} 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(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      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" # 公共资源
+      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
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
     @path = user_resource_user_path(User.current, :type => @type)
@@ -2031,9 +2090,38 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} 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(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      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" # 公共资源
+      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 = 25
     @path = user_resource_user_path(User.current, :type => @type)