developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update

This commit is contained in:
chris 2012-10-26 11:20:26 +08:00
parent d7fd61ce55 2b2dd53218
commit b301f6522a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,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 @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?) if(!params[:show_plugin_profile].nil?)
@right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary' @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary'
else else
@right_partial = "plugin_summary" @right_partial = "plugin_summary"
end end
# binding.pry
# @user.attribute_values.each{|att_val| # @user.attribute_values.each{|att_val|
# @teacher_data.push({:name => att_val.attribute_field.title,:value =>att_val[I18n.locale]}) # @teacher_data.push({:name => att_val.attribute_field.title,:value =>att_val[I18n.locale]})
# } # }