diff --git a/lib/ext/entities.rb b/lib/ext/entities.rb index df2aeea..1d1021e 100644 --- a/lib/ext/entities.rb +++ b/lib/ext/entities.rb @@ -5,7 +5,7 @@ module Noosfero module Entities class Person < Profile - expose :orientacao_sexual, :identidade_genero, :transgenero, :etnia + expose :orientacao_sexual, :identidade_genero, :transgenero, :etnia, :membro_conselho expose :points do |person, options| person.points if person.respond_to?(:points) diff --git a/lib/ext/environment.rb b/lib/ext/environment.rb index 5019082..bbadd57 100644 --- a/lib/ext/environment.rb +++ b/lib/ext/environment.rb @@ -10,6 +10,7 @@ class Environment orig_custom_person_fields.merge!({'transgenero' => {"active"=>"true", "required"=>"false", "signup"=>"true"}}) orig_custom_person_fields.merge!({'etnia' => {"active"=>"true", "required"=>"false", "signup"=>"true"}}) orig_custom_person_fields.merge!({'city' => {"active"=>"true", "required"=>"false", "signup"=>"true"}}) + orig_custom_person_fields.merge!({'membro_conselho' => {"active"=>"true", "required"=>"false", "signup"=>"true"}}) orig_custom_person_fields end diff --git a/lib/ext/person.rb b/lib/ext/person.rb index ea68a13..4bed028 100644 --- a/lib/ext/person.rb +++ b/lib/ext/person.rb @@ -2,9 +2,9 @@ require_dependency 'person' class Person - settings_items :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia + settings_items :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia, :membro_conselho - attr_accessible :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia + attr_accessible :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia, :membro_conselho def is_profile_complete? #FIXME: this check is hardcoded to satisfy a temporary issue. @@ -14,7 +14,7 @@ class Person self.data[:etnia].blank? or self.data[:orientacao_sexual].blank? or self.data[:state].blank? or - self.data[:city].blank?) + self.data[:city].blank? or self.data[:membro_conselho].blank?) end def conference_comments diff --git a/lib/ext/user.rb b/lib/ext/user.rb index 556694e..d0d7291 100644 --- a/lib/ext/user.rb +++ b/lib/ext/user.rb @@ -50,4 +50,13 @@ class User def category_ids= categories self.person_data[:category_ids] = categories end + + def membro_conselho + self.person.membro_conselho unless self.person.nil? + end + + def membro_conselho= value + self.person_data[:membro_conselho] = value + end + end -- libgit2 0.21.2