From c73637a4caf279069ce75b482dc241af002487d5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Mar 2016 16:42:10 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 3532a9e4c..474fc31fd 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -17,9 +17,9 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]

From 282a720916e5809a1c4578ae3469ff5f681dffce Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 17 Mar 2016 17:08:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=A7=81=E6=9C=89=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=B5=84=E6=BA=90=E6=A0=8F=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_org_subfield_list.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index ab547db87..722024a85 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -49,11 +49,13 @@
                         <ul class="homepagePostSettiongText">
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                             <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                          <% if file.container.try(:organization).try(:is_public?) %>
                             <li>
                               <span id="is_public_<%= file.id %>">
                                 <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
                               </span>
                             </li>
+                          <% end %>
                             <li>
                               <%= link_to( '删除资源', attachment_path(file),
                                                :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>

From 2466184d8a2f18eb53b26622d6aa76b07d665fb3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Mar 2016 17:34:29 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=BF=98=E8=A6=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E5=90=88=E7=90=86=EF=BC=8C=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=20=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6layout=E6=A0=B9=E6=8D=AE=E6=9D=A5=E6=BA=90=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 10 ++++++++--
 app/views/homework_common/edit.html.erb       |  8 +++++++-
 app/views/users/_user_homework_form.html.erb  |  7 ++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 474fc31fd..091e2b86b 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -51,8 +51,14 @@ class HomeworkCommonController < ApplicationController
     @user = User.current
     @is_in_course = params[:is_in_course].to_i
     @course_activity = params[:course_activity].to_i
-    respond_to do |format|
-      format.html{render :layout => 'new_base_user'}
+    if @is_in_course == 1 || @course_activity == 1
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+      end
+    else
+      respond_to do |format|
+        format.html{render :layout => 'new_base_user'}
+      end
     end
   end
 
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index f95739f26..0c120b7c2 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -1,4 +1,10 @@
 <script type="text/javascript">
+  <% if @is_in_course == 1 || @course_activity == 1 %>
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+  <% end %>
     function reset_homework(){
         $("#homework_name").val("");
         $("#homework_publish_time").val("");
@@ -24,7 +30,7 @@
         <% end %>
     }
 </script>
-<div class="homepageRightBanner mb10">
+<div class="homepageRightBanner mb10 <%= (@is_in_course == 1 || @course_activity == 1) ? 'ml10' : '' %>">
   <div class="NewsBannerName">编辑作业</div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index f23d01d3c..54fe4396b 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -194,9 +194,10 @@
     </div>
     <div class="cl"></div>
 
-    <div class="mt10 <%= defined?(select_course) ? 'none' : ''%>">
-      <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
-    </div>
+    <!--<div class="mt10 <%= defined?(select_course) ? 'none' : ''%>">
+      <%#= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
+    </div>-->
+    <%= hidden_field_tag :course_id, params[:course_id], :value =>homework.course_id %>
     <p id="homework_course_id_span" class="c_red mt5"></p>
     <p id="e_tip" class="c_grey"></p>
     <p id="e_tips" class="c_grey"></p>

From 119b12349b3c665952176314569ab857a9314e17 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 10:56:35 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E7=9C=81=E5=80=BC=E4=B8=BA=20=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0+=E7=9A=84=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4(=E5=8F=AF=E4=BF=AE=E6=94=B9)=20=20=E8=8B=A5?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=8D=E4=BF=AE=E6=94=B9=E5=88=99=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=B8=BA=20=E4=BD=9C=E4=B8=9A=E5=90=8D=E7=A7=B0+?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 3 ++-
 app/views/student_work/new.html.erb        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index aa77e2d51..a698823e5 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
@@ -282,7 +283,7 @@ class StudentWorkController < ApplicationController
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
       student_work ||= StudentWork.new
-      student_work.name = params[:student_work][:name]
+      student_work.name = params[:student_work][:name] == "#{@homework.name}的作品提交(可修改)" ? "#{@homework.name}的作品提交" : params[:student_work][:name]
       student_work.description = params[:student_work][:description]
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index c43482299..0a29d2f6e 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -242,7 +242,7 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
         <% end %>
         <div>
-          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称",:value=>"#{@homework.name}的作品提交", :onkeyup => "regexStudentWorkName();" %>
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称",:value=>"#{@homework.name}的作品提交(可修改)", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>

From 24318e3d6b5d9edd41736e84002f46f4aa0b7b4f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 12:47:25 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index adb4eb91e..79ecd6932 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -572,8 +572,8 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     search = params[:name].to_s.strip.downcase
-    type_ids = params[:property] ? "(" + params[:property] + ")" : "(1, 2, 3)"
-    if(params[:type].blank? || params[:type] == "1") #全部
+    type_ids = params[:property]=="" ? "(1, 2, 3)" : "(" + params[:property] + ")"
+        if(params[:type].blank? || params[:type] == "1") #全部
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'")

From b1f3395bd1f40b4b709c3dec238a6b7202439f34 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 14:45:42 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=A1=86=E5=92=8C=E5=90=8D=E7=A7=B0=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/new.html.erb     | 21 ++++++++++++++-------
 app/views/users/user_homeworks.html.erb |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 0a29d2f6e..a7e223ac1 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -79,10 +79,6 @@
       }
   }
 
-  var KE = {
-      MDU: "1234455",//当前文章标识符
-  };
-
   function nh_check_field(params){
       var result=true;
       if(!regexStudentWorkName()) {
@@ -90,14 +86,14 @@
           return result;
       }
       if(params.content!=undefined){
-          if(params.content.isEmpty()){
+          if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\uFE30-\uFFA0][\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.content.html())){
               result=false;
           }
           if(params.content.html()!=params.textarea.html() || params.issubmit==true){
               params.textarea.html(params.content.html());
               params.content.sync();
 
-              if(params.content.isEmpty()){
+              if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\uFE30-\uFFA0][\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.content.html())){
                   params.contentmsg.html('作品描述不能为空');
               }else{
                   params.contentmsg.html('');
@@ -150,6 +146,17 @@
               edit.iframe.height(150);
               this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, 150));
           },
+          afterBlur:function(){
+              if(this.isEmpty()) {
+                  this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>请在此输入作品描述，您可以直接在这里粘贴作业图片</span>");
+              }
+          },
+          afterFocus: function(){
+              var edit = this.edit;
+              if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\uFE30-\uFFA0][\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+                  edit.html('');
+              }
+          },
           afterCreate:function(){
               //init
               var edit = this.edit;
@@ -159,7 +166,7 @@
               //reset height
               var edit = this.edit;
               var body = edit.doc.body;
-              edit.html(params.textarea.innerHTML);
+              edit.html("<span id='hint' style='color: #999999; font-size: 12px'>请在此输入作品描述，您可以直接在这里粘贴作业图片</span>");
               //paramsHeight = params.kindutil.removeUnit(this.height);
               edit.iframe.height(150);
               this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 683cb7019..2cd1f5b21 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -58,7 +58,7 @@
         </ul>
         <div class="cl"></div>
         <div id="homework_search_input" class="mt10 fl">
-            <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => @property} %>
+            <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => nil} %>
         </div>
         <div class="cl"></div>
         <div class="w683 fl mr10 mt10" id="homework_repository_list">

From e34f2e45db277b5d96ce83581ce1ba4d60323633 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 14:53:06 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 4 ++++
 app/views/admin/courses.html.erb    | 4 ++++
 app/views/admin/projects.html.erb   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 90981b52a..f8ca1d0e2 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -40,12 +40,16 @@ class AdminController < ApplicationController
     @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
 =end
     @projects = Project.like(@name).order('created_on desc')
+    @projects = paginateHelper @projects,30
+    @page = (params['page'] || 1).to_i - 1
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
     @courses = Course.like(@name).order('created_at desc')
+    @courses = paginateHelper @courses,30
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
diff --git a/app/views/admin/courses.html.erb b/app/views/admin/courses.html.erb
index 1615bccbc..2505b3d06 100644
--- a/app/views/admin/courses.html.erb
+++ b/app/views/admin/courses.html.erb
@@ -73,4 +73,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_course_all)) -%>
diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index d12e85856..5e3a927da 100644
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -73,6 +73,10 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_project_plural)) -%>
 
 <script>

From e167a28d49ad15983730a805332f77efac4b8a5f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 14:59:34 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_recommendation.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index f697383ca..28cc54ab8 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -11,8 +11,8 @@
                 <% if e_course.attachments.count > 0 %>
                     <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
                 <% end %>
-                <% if e_course.homework_commons.count > 0 %>
-                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
+                <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %>
+                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
                 <% end %>
                 <div class="cl"></div>
               </p>

From 9917e802cb651f3d20a505341489fd285411698c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 15:15:25 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 24f5fd52c..dfa30915e 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -7,6 +7,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
   helper :attachments
+  helper :files
   helper :activity_notifys
 
   before_filter :auth_login1, :only => [:show, :course_activity, :feedback]
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index 28cc54ab8..d92eb3cf4 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -8,8 +8,8 @@
             <div class="fl">
               <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
               <p class="f12">
-                <% if e_course.attachments.count > 0 %>
-                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
+                <% if visable_attachemnts(e_course.attachments).count > 0 %>
+                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to visable_attachemnts(e_course.attachments).count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
                 <% end %>
                 <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %>
                     <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>