From e11581c0ee5a3b6847e2a8a93d8b017d9cdf3c81 Mon Sep 17 00:00:00 2001 From: Saurabh Bhatia Date: Thu, 26 Jun 2014 10:00:55 +0800 Subject: [PATCH] fixes in member profile show page --- app/controllers/members_controller.rb | 2 +- app/models/member_profile.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 4aab9bb..658af24 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -50,7 +50,7 @@ class MembersController < ApplicationController # end elsif intro.brief_intro == true pd = [] - pd << { "data_title" => intro.text.html_safe} + pd << {"data_title" => intro.text.html_safe} { "plugin_data" => pd, "plugin_title" => plugin.app_name.titleize diff --git a/app/models/member_profile.rb b/app/models/member_profile.rb index 1b9ab40..2bbaf5b 100644 --- a/app/models/member_profile.rb +++ b/app/models/member_profile.rb @@ -70,9 +70,9 @@ class MemberProfile def get_attribute_value(attribute_field,attribute_type=nil) if attribute_type.eql?("role") - AttributeValue.find_by(attribute_field_id: attribute_field.id) + AttributeValue.find_by(attribute_field_id: attribute_field.id, member_profile_id: self.id) else - MemberProfileFieldValue.find_by(member_profile_field_id: attribute_field.id) + MemberProfileFieldValue.find_by(member_profile_field_id: attribute_field.id, member_profile_id: self.id) end end