From 19be668221194fd48c8174bc4d79a2240db93e30 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 28 Aug 2014 11:52:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3RImagic=E4=BF=9D=E5=AD=98gi?=
 =?UTF-8?q?f=E6=A0=BC=E5=BC=8F=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/avatar_controller.rb  | 17 ++++++++++-------
 app/controllers/courses_controller.rb |  9 +++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index fa7eb6052..b7dec5453 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -55,17 +55,20 @@ class AvatarController < ApplicationController
     # saved = @avatar.save
     begin
       f = Magick::ImageList.new(diskfile)
-      width = 300.0
-      proportion = (width/f[0].columns)
-      height = (f[0].rows*proportion)
-      f.resize_to_fill!(width,height)
-      # f.scale!(width,height)
-      f.write(diskfile)
+      # gif格式不再做大小处理
+      if f.format != 'GIF'
+        width = 300.0
+        proportion = (width/f[0].columns)
+        height = (f[0].rows*proportion)
+        f.resize_to_fill!(width,height)
+        f.write(diskfile)
+      end
+
     rescue Exception => e
       logger.error "[Error] avatar : avatar_controller#upload ===> #{e}"
     end
 
-    
+
     respond_to do |format|
       format.js
       format.api {
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 38ae662fc..aa5e2c2a6 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -605,6 +605,15 @@ class CoursesController < ApplicationController
       events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
 
+    # 无新动态时，显示老动态
+    if events.count == 0
+      if User.current.member_of_course?(@course)|| User.current.admin?
+        events = @activity.events
+      else
+        events = @activity.events(:is_public => 1)
+      end
+    end
+
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @events_count = events.count
     @events_pages = Paginator.new @events_count, @limit, params['page']