diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 01f16bc46..dce558ac4 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -43,7 +43,12 @@ class AdminController < ApplicationController # 搜索功能 @name = params[:name] || "" condition = "#{@name.strip}".gsub(" ","") - @projects = Project.like(condition).order('created_on desc') + @status = params[:status] || "" + unless @status.empty? + @projects = Project.where(:status=>@status).like(condition).order('created_on desc') + else + @projects = Project.like(condition).order('created_on desc') + end # 分页 @projects = paginateHelper @projects,30 @page = (params['page'] || 1).to_i - 1 diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index e5fcd8314..893ea0cea 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -29,7 +29,9 @@ <% if show_nav?(course_feedback_count) %>
  • 留言 + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%> + <% end %>
  • <% end %> <% if show_nav?(course_poll_count) %>