alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for meember role disabled fields and also role will delete all the attribute fields

This commit is contained in:
Harry Bomrah 2015-07-08 20:00:59 +08:00
parent 59a198005d
commit 93d66b5866
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/members_controller.rb
View File

@ -236,9 +236,37 @@ class MembersController < ApplicationController
end end
when 'role' when 'role'
if !field['id'].blank? if !field['id'].blank?
field_data = member.attribute_values.find_by(:attribute_field_id=>field['id'],:key=>field['key']).get_field_value rescue {} av = member.attribute_values.find_by(:attribute_field_id=>field['id'],:key=>field['key']) rescue nil
if !av.nil?
r = av.attribute_field.role rescue nil
if !r.nil?
if memeber.roles.include?(r)
field_data = av.get_field_value rescue {}
else
field_data = {}
end
else
field_data = {}
end
else
field_data = {}
end
else else
field_data = member.attribute_values.find_by(:key=>field['key']).get_field_value rescue {} av = member.attribute_values.find_by(:key=>field['key']) rescue nil
if !av.nil?
r = av.attribute_field.role rescue nil
if !r.nil?
if member.roles.include?(r)
field_data = av.get_field_value rescue {}
else
field_data = {}
end
else
field_data = {}
end
else
field_data = {}
end
end end
end end
next if field_data.blank? or field_data['value'].blank? next if field_data.blank? or field_data['value'].blank?

16
app/helpers/attribute_values_helper.rb
View File

@ -22,7 +22,7 @@ module AttributeValuesHelper
end end
def show_minguo_calendar(from_to=nil) def show_minguo_calendar(from_to=nil)
get_minguo # get_minguo
case from_to case from_to
when :to when :to
@ -96,12 +96,14 @@ module AttributeValuesHelper
def get_date_by_format(from_to = nil) def get_date_by_format(from_to = nil)
case I18n.locale case I18n.locale
when :zh_tw when :zh_tw
case # case
when self.member_profile_field["typeC"]["calendar"] == "west_calendar" # when self.member_profile_field["typeC"]["calendar"] == "west_calendar"
show_west_calender(from_to) # show_west_calender(from_to)
when self.member_profile_field["typeC"]["calendar"] == "tw_calendar" # when self.member_profile_field["typeC"]["calendar"] == "tw_calendar"
show_minguo_calendar(from_to) # show_minguo_calendar(from_to)
end #case self.member_profile_field["typeC"]["calendar"] # end #case self.member_profile_field["typeC"]["calendar"]
show_west_calender(from_to)
when :en when :en
show_west_calender(from_to) show_west_calender(from_to)
end end

2
app/models/role.rb
View File

@ -10,7 +10,7 @@ class Role
has_and_belongs_to_many :member_profiles has_and_belongs_to_many :member_profiles
has_many :authorizations has_many :authorizations
has_many :attribute_fields has_many :attribute_fields, dependent: :destroy
accepts_nested_attributes_for :attribute_fields accepts_nested_attributes_for :attribute_fields
has_many :role_statuses, dependent: :destroy has_many :role_statuses, dependent: :destroy