From af107d861b96f548884c33fd4d4cd5e7255420c4 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 13 May 2015 16:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=8B=E8=BD=BD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 1 +
 app/controllers/users_controller.rb   | 1 -
 app/views/courses/show.html.erb       | 3 ++-
 app/views/users/show.html.erb         | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a1e547a84..1d1212bf1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :activities
   helper :members
   helper :words
+  helper :attachments
 
   before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ccf382006..2a10af260 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class UsersController < ApplicationController
-  helper :attachments
 
   layout :setting_layout
   #Added by young
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 1d2c42457..c46ee2d03 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -21,6 +21,7 @@
                   <br />
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
+                <%= link_to_attachments_course(e) %>
               </div>
               <div class="cl"></div>
             </div><!--课程动态 end-->
@@ -49,4 +50,4 @@
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
-<div class="cl"></div>
\ No newline at end of file
+<div class="cl"></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 484a79ea2..fe36b2cd1 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -432,7 +432,6 @@
                           <td colspan="2" width="580" class="upload_img">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
-                                <%= link_to_attachments_course e.act %>
                             </p>
                           </td>
                         </tr>