Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
This commit is contained in:
commit
c511600cad
|
@ -49,13 +49,13 @@ class Admin::UsersNewInterfaceController < ApplicationController
|
|||
@staff_data.push({:name => att_val.attribute_field.title,:value => att_val.get_value_by_locale(I18n.locale) }) if att_val.attribute_field.role.key=="staff_data"rescue false
|
||||
}
|
||||
|
||||
|
||||
if(!params[:show_plugin_profile].nil?)
|
||||
@right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary'
|
||||
else
|
||||
@right_partial = "plugin_summary"
|
||||
end
|
||||
|
||||
# binding.pry
|
||||
# @user.attribute_values.each{|att_val|
|
||||
# @teacher_data.push({:name => att_val.attribute_field.title,:value =>att_val[I18n.locale]})
|
||||
# }
|
||||
|
|
Reference in New Issue