From fbe3e535b4c4af1759c1cfab6d08cbd8fe96b51f Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Tue, 5 Aug 2014 15:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8E=92=E5=BA=8Fbug=20=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=8A=A8=E6=80=81=E6=97=B6=E9=97=B4=E6=AE=B5=E7=BA=A6?=
 =?UTF-8?q?=E6=9D=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb |  4 +++-
 app/controllers/files_controller.rb   | 21 +++++++++++++++++----
 app/views/courses/show.html.erb       |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 85dfba8cf..6989b0b4f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -624,7 +624,9 @@ class CoursesController < ApplicationController
         "show_course_journals_for_messages" => true
     }
     @date_to ||= Date.today + 1
-    @date_from = @date_to - @days-1.years
+    #
+    @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
+    #@date_from = @date_to - @days-1.years
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
     # 决定显示所用用户或单个用户活动
     @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a2d791017..9e41f467b 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -40,9 +40,17 @@ class FilesController < ApplicationController
       render :layout => !request.xhr?
     elsif params[:course_id]
       @isproject = false
-      @order = params[:sort].split(",")[0];
-      @orderBy = @order.split(":")[0];
-      @orderType = @order.split(":")[1];
+
+      if params[:sort]
+        if params[:sort].include?":"
+          @orderBy = params[:sort].split(":")[0];
+          @orderType = params[:sort].split(":")[1].split(",")[0];
+        else
+          @orderBy = params[:sort].split(",")[0];
+          @orderType = "asc";
+        end
+      end
+
       if @orderBy=="size"
          @orderBy="filesize"
       elsif @orderBy=="field_file_dense"
@@ -52,7 +60,12 @@ class FilesController < ApplicationController
       elsif @orderBy=="content_type"
         @orderBy="attachtype"
       end
-      @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.#{@orderBy} #{@orderType}").find(@course.id)]
+
+      if @orderBy
+        @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.#{@orderBy} #{@orderType}").find(@course.id)]
+      else
+        @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on desc").find(@course.id)]
+      end
       render :layout => 'base_courses'
     end
   end
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 8b713476e..deb590d1f 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -2,7 +2,7 @@
     <div class="content-title-top-avtive">
       <!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
       <p class="subtitle">
-        <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+        <%= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %>
       </p>
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>