Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

app/controllers/homework_common_controller.rb

@@ -18,10 +18,10 @@ class HomeworkCommonController < ApplicationController
     @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)
-      @homework_commons = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @homework_commons = @course.homework_commons.order("created_at desc")
     else
       @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
-      @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc")
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]

app/views/courses/_show_member_score.html.erb

@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score)  %></span></li>
     </ul>
 
   </div>