Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update
This commit is contained in:
		
						commit
						b301f6522a
					
				|  | @ -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 | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
|     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]}) | ||||
|     # } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue