Merge branch 'dev_shcool' into develop

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

app/views/courses/_tool_expand.html.erb

@@ -29,7 +29,9 @@
 <% if show_nav?(course_feedback_count) %>
     <li>
       <a href="<%=course_feedback_path(@course) %>">留言</a>
+      <% 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 %>
     </li>
 <% end %>
 <% if show_nav?(course_poll_count) %>