diff --git a/app/assets/javascripts/admin/personal_plugins.js.coffee b/app/assets/javascripts/admin/personal_plugins.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/admin/personal_plugins.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/admin/personal_plugins.css.scss b/app/assets/stylesheets/admin/personal_plugins.css.scss new file mode 100644 index 0000000..a7dcc1e --- /dev/null +++ b/app/assets/stylesheets/admin/personal_plugins.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin/personal_plugins controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 6f16a76..437e59f 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -74,6 +74,20 @@ class Admin::MembersController < OrbitMemberController def show @custom_fields = @member.member_profile_field_values rescue nil + @plugins = OrbitApp::Plugin::Registration.all rescue nil + @ppname = Array.new + @plugins.each do |aa| + @ppname << [aa.sort_number.to_i, [aa.name, aa.app_name, aa.intro_app_name, aa.front_partial_path]] + end + @plugin_shows = @ppname.sort.collect {|v| {"name"=>v[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} } + + if(!params[:show_plugin_profile].nil?) + @plugin_app_name = OrbitApp::Plugin::Registration.find_by(app_name: params[:show_plugin_profile]).name rescue nil + else + @plugin_app_name = '' + end + + get_info_and_roles end def new diff --git a/app/controllers/admin/personal_plugins_controller.rb b/app/controllers/admin/personal_plugins_controller.rb new file mode 100644 index 0000000..fc5f416 --- /dev/null +++ b/app/controllers/admin/personal_plugins_controller.rb @@ -0,0 +1,5 @@ +class Admin::PersonalPluginsController < OrbitMemberController + def index + @plugins = OrbitApp::Plugin::Registration.all rescue nil + end +end diff --git a/app/helpers/admin/personal_plugins_helper.rb b/app/helpers/admin/personal_plugins_helper.rb new file mode 100644 index 0000000..8c4966d --- /dev/null +++ b/app/helpers/admin/personal_plugins_helper.rb @@ -0,0 +1,2 @@ +module Admin::PersonalPluginsHelper +end diff --git a/app/models/member_profile.rb b/app/models/member_profile.rb index b21a6b6..f4739f3 100644 --- a/app/models/member_profile.rb +++ b/app/models/member_profile.rb @@ -48,8 +48,14 @@ class MemberProfile end end + def new_attribute_values=(fields) + fields.each do |key,field| + self.member_profile_field_values.build(field) + end + end + def get_attribute_value(attribute_field) - attribute_values.find_by(attribute_field_id: attribute_field.id) + MemberProfileFieldValue.find_by(member_profile_field_id: attribute_field.id.to_s) end def get_attribute_values diff --git a/app/views/admin/members/_info.html.erb b/app/views/admin/members/_info.html.erb index 2742786..16443a2 100644 --- a/app/views/admin/members/_info.html.erb +++ b/app/views/admin/members/_info.html.erb @@ -10,12 +10,12 @@ <% content_for :page_specific_javascript do -%> -<% ( params[:id].blank? ? @fname = 'new_attribute_values' : @fname = 'attribute_values' ) %> - +<% ( params[:id].blank? ? @fname = 'new_attribute_values' : @fname = 'member_profile_field_values' ) %> +console.log(<%= @fname%>);