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

app/controllers/admin/members_controller.rb

@@ -703,7 +703,7 @@ class Admin::MembersController < OrbitMemberController
   protected
 
   def get_info_and_roles
-    @roles = Role.excludes(disabled: true)
+    @roles = Role.excludes(disabled: true).asc(:key)
     @infos = MemberProfileField.excludes(disabled: true)
   end
 

app/controllers/admin/role_statuses_controller.rb

@@ -3,7 +3,7 @@ class Admin::RoleStatusesController < OrbitMemberController
 
   def index
   	@role = Role.find(params[:role_id]) rescue nil
-  	@role_statuses = RoleStatus.where(role_id: @role.id) if @role
+  	@role_statuses = RoleStatus.where(role_id: @role.id).asc(:key) if @role
 
   	respond_to do |format|
       format.html # index.html.erb

app/controllers/admin/roles_controller.rb

@@ -4,7 +4,7 @@ class Admin::RolesController < OrbitMemberController
   helper Admin::AttributeValuesViewHelper
 
   def index
-  	@roles = Role.all.asc("_id").entries
+  	@roles = Role.all.asc(:key).entries
   end
 
   def show

app/controllers/members_controller.rb

@@ -33,11 +33,15 @@ class MembersController < ApplicationController
         { "title" => role.title, "id" => role.id, "status" => RoleStatus.where(:role_id=>role, :_id.in=>page_role_status).to_a }
       end
     end
-
+    
     role_list = []
     roles.each do |role|
       attribute_field = AttributeField.where(:key => 'job_title', :role_id => role['id']).first
-      role_fields_to_show = [{"id"=> attribute_field.id.to_s, "key"=>"job_title", "type"=>"role","sort_order"=>1}] + fields_to_show if !attribute_field.blank?
+      if !attribute_field.blank?
+        role_fields_to_show = [{"id"=> attribute_field.id.to_s, "key"=>"job_title", "type"=>"role","sort_order"=>1}] + fields_to_show 
+      else
+        role_fields_to_show = fields_to_show
+      end 
       status_list = []
       if !role['status'].blank?
         role['status'].each do |status|