From 22335b23a66d5f068128012256664302c761b42c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 6 Aug 2014 15:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E5=9C=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84BUG=20#1180?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/members_helper.rb                        | 7 +++++--
 app/views/files/_course_show_all_attachment.html.erb | 2 +-
 app/views/messages/_course_show.html.erb             | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 134b7c007..ecfb097e9 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -53,10 +53,13 @@ module MembersHelper
 
   # 当前申请加入的成员名单
   def render_principals_for_applied_members(project)
-    scope = Principal.active.sorted.applied_members(project).like(params[:q])
+    scope = project.applied_projects.map(&:user)
     principal_count = scope.count
     principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page']
-    principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+    offset ||= principal_pages.offset
+    principals = scope[offset, 10]
+    #principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+    #principals = ApplicationController.new.paginateHelper scope,10
 
     s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
 
diff --git a/app/views/files/_course_show_all_attachment.html.erb b/app/views/files/_course_show_all_attachment.html.erb
index f94ddc20b..8f6fbc395 100644
--- a/app/views/files/_course_show_all_attachment.html.erb
+++ b/app/views/files/_course_show_all_attachment.html.erb
@@ -21,7 +21,7 @@
     <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+    <!-- <%#= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>
   <tbody>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 243406a3c..4db903b88 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -104,6 +104,8 @@
     <div class="memo-content">
       <%= textilizable(@topic, :content) %>
       <%= link_to_attachments @topic, :author => false %>
+      <%# options = {:author => true, :deletable => @topic.author.eql?(User.current)} %>
+      <%#= render :partial => 'attachments/app_link', :locals => {:attachments => @topi.attachments, :options => options} %>
     </div>
     <div class="memo-timestamp">
       <div style="float: left"><%= authoring @topic.created_on, @topic.author %></div>