diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 4406fb1..472316b 100644 --- a/app/controllers/admin/members_controller.rb +++ b/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 diff --git a/app/controllers/admin/role_statuses_controller.rb b/app/controllers/admin/role_statuses_controller.rb index 8db168d..d18d00e 100644 --- a/app/controllers/admin/role_statuses_controller.rb +++ b/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 diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb index e552757..c2a7c09 100644 --- a/app/controllers/admin/roles_controller.rb +++ b/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 diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 7ea2111..4f0115d 100644 --- a/app/controllers/members_controller.rb +++ b/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|