[Git][noosfero/noosfero][master] Move requires_email to organization so that enterprise doesn't crash

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
fbdee132 by Hugo Melo at 2016-06-29T18:34:56-03:00
Move requires_email to organization so that enterprise doesn't crash

- - - - -


2 changed files:

- app/models/community.rb
- app/models/organization.rb


Changes:

=====================================
app/models/community.rb
=====================================
--- a/app/models/community.rb
+++ b/app/models/community.rb
@@ -2,7 +2,7 @@ class Community < Organization
 
   attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
   attr_accessible :address_reference, :district, :tag_list, :language, :description
-  attr_accessible :requires_email
+
   after_destroy :check_invite_member_for_destroy
 
   def self.type_name
@@ -13,9 +13,6 @@ class Community < Organization
   N_('Language')
 
   settings_items :language
-  settings_items :requires_email, :type => :boolean
-
-  alias_method :requires_email?, :requires_email
 
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state


=====================================
app/models/organization.rb
=====================================
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -2,6 +2,10 @@
 class Organization < Profile
 
   attr_accessible :moderated_articles, :foundation_year, :contact_person, :acronym, :legal_form, :economic_activity, :management_information, :cnpj, :display_name, :enable_contact_us
+  attr_accessible :requires_email
+
+  settings_items :requires_email, type: :boolean
+  alias_method :requires_email?, :requires_email
 
   SEARCH_FILTERS = {
     :order => %w[more_recent more_popular more_active],



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/fbdee132ab393bc8a3afe4f9abb746171f36d803
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160629/831f5e56/attachment-0001.html>