调整竞赛列表页面中的排序问题

app/controllers/contests_controller.rb

@@ -34,20 +34,20 @@ class ContestsController < ApplicationController
     case params[:contest_sort_type]
       when '0'
         unless @offset == 0
-          @contests = @contests.offset(@offset).limit(@limit).all.reverse
+          @contests = @contests.reorder('contests.commit').offset(@offset).limit(@limit).all.reverse
         else
           limit = @contest_count % @limit
           limit = @limit  if limit == 0
-          @contests = @contests.offset(@offset).limit(limit).all.reverse
+          @contests = @contests.reorder('contests.commit').offset(@offset).limit(limit).all.reverse
         end
         @s_state = 0
       when '1'
         unless @offset == 0
-          @contests = @contests.reorder('contests.commit').offset(@offset).limit(@limit).all.reverse
+          @contests = @contests.reorder('contests.created_on').offset(@offset).limit(@limit).all.reverse
         else
           limit = @contest_count % @limit
           limit = @limit  if limit == 0
-          @contests = @contests.reorder('contests.commit').offset(@offset).limit(limit).all.reverse
+          @contests = @contests.reorder('contests.created_on').offset(@offset).limit(limit).all.reverse
         end
         @s_state = 1
       when '2'
@@ -62,11 +62,11 @@ class ContestsController < ApplicationController
       end
       else
         unless @offset == 0
-          @contests = @contests.reorder('contests.commit').offset(@offset).limit(@limit).all.reverse
+          @contests = @contests.reorder('contests.created_on').offset(@offset).limit(@limit).all.reverse
         else
           limit = @contest_count % @limit
           limit = @limit  if limit == 0
-          @contests = @contests.reorder('contests.commit').offset(@offset).limit(limit).all.reverse
+          @contests = @contests.reorder('contests.created_on').offset(@offset).limit(limit).all.reverse
         end
         @s_state = 1
     end

app/helpers/contests_helper.rb

@@ -62,12 +62,12 @@ module ContestsHelper
     content = ''.html_safe
     case state
     when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'contests', action: 'index' ,:contest_sort_type => '1'}))
+      content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'contests', action: 'index' ,:contest_sort_type => '1'}))
-      content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'contests', action: 'index' ,:contest_sort_type => '0'}, :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'contests', action: 'index' ,:contest_sort_type => '0'}, :class=>"selected"), :class=>"selected")
       
     when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'contests', action: 'index' ,:contest_sort_type => '1'}, :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'contests', action: 'index' ,:contest_sort_type => '1'}, :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'contests', action: 'index' ,:contest_sort_type => '0'}))
+      content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'contests', action: 'index' ,:contest_sort_type => '0'}))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")