Merge branch 'master' into 'master'

作业和试卷已发布的状态是显示发布时间，未发布状态显示创建时间



See merge request !41

app/controllers/courses_controller.rb

@@ -638,7 +638,11 @@ class CoursesController < ApplicationController
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
         WHERE members.course_id = #{@course.id} AND members.course_group_id = #{@group.id} ORDER BY score desc")
-    
+    # if @order == "student_id"
+    #   @members = @course.members.where(:course_group_id => @group.id).joins("join user_extensions on members.user_id = user_extensions.user_id").select{|m| m.roles.to_s.include?("Student")}.reorder("student_id #{@sort}")
+    # else
+    #   @members = @course.members.where(:course_group_id => @group.id).joins("join users on members.user_id = users.id").select{|m| m.roles.to_s.include?("Student")}.reorder("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@sort}, login #{@b_sort}")
+    # end
     if q.nil? || q == ""
     else
       members = []

app/views/homework_common/_homework_index_list.html.erb

@@ -29,7 +29,11 @@
             <div class="cl"></div>
             <p class="color-grey font-12 mt20">
 
-              <span>创建于<%=time_from_now homework_common.created_at %></span>
+              <% if homework_common.homework_detail_manual.try(:comment_status) == 0 %>
+                <span>创建于<%=time_from_now homework_common.created_at %></span>
+              <% else %>
+                  <span>发布于<%=time_from_now homework_common.publish_time %></span>
+              <% end %>
               <!--<span class="ml30"><%#=homework_common.homework_type_ch %></span>-->
               <% if [1,2,3,4,5,6].include?(homework_common.homework_detail_manual.try(:comment_status)) %>
                   <% if @is_teacher %>