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

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb

app/controllers/admin/plugins_controller.rb

@@ -4,7 +4,7 @@ class Admin::PluginsController < ApplicationController
   
   def index
   
-    @module_apps = ModuleApp.excludes(widgets: nil).where(has_plugin: true).order_by(:title, :asc)
+    @plugins = ModuleApp.where(has_plugin: true).order_by(:title, :asc)
   
   end
 

app/controllers/admin/users_new_interface_controller.rb

@@ -26,6 +26,8 @@ class Admin::UsersNewInterfaceController < ApplicationController
   
   def show
     @user = User.find(params[:id])
+    @plugins = OrbitApp::Module::Registration.all
+
     @profile_data = []
     @teacher_data = []
     @student_data = []
@@ -47,6 +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
+
     # @user.attribute_values.each{|att_val|
     #   @teacher_data.push({:name => att_val.attribute_field.title,:value =>att_val[I18n.locale]})
     # }