alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Harry Bomrah 2015-04-22 16:33:09 +08:00
parent babf12c777 dd5f7ed234
commit 760404cbd2
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/members_controller.rb
View File

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

2
app/controllers/admin/role_statuses_controller.rb
View File

@ -3,7 +3,7 @@ class Admin::RoleStatusesController < OrbitMemberController
def index def index
@role = Role.find(params[:role_id]) rescue nil @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| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb

2
app/controllers/admin/roles_controller.rb
View File

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

8
app/controllers/members_controller.rb
View File

@ -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 } { "title" => role.title, "id" => role.id, "status" => RoleStatus.where(:role_id=>role, :_id.in=>page_role_status).to_a }
end end
end end
role_list = [] role_list = []
roles.each do |role| roles.each do |role|
attribute_field = AttributeField.where(:key => 'job_title', :role_id => role['id']).first 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 = [] status_list = []
if !role['status'].blank? if !role['status'].blank?
role['status'].each do |status| role['status'].each do |status|