Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu

2015-04-22 23:07:18 +08:00 · 2015-04-22 23:07:18 +08:00 · 45f58990f0
parent 143d8009c5 b27467c65d
commit 45f58990f0
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@ -45,7 +45,7 @@ class MembersController < ApplicationController
        end
      else
        # Members with status
-        role_status = RoleStatus.order_by(:id=>"asc").where(:role_id=>role['id'])
+        role_status = RoleStatus.order_by(:key=>"asc").where(:role_id=>role['id'])
        role_status_ids = role_status.collect{|status| status.id.to_s}

        role_status.each do |status|