Merge branch 'ai3051' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai3051

Rodrigo Souto
2 parents f2e97688 120db5fe
Showing 6 changed files with 73 additions and 35 deletions Show diff stats
app/models/enterprise.rb
app/models/enterprise_activation.rb
db/migrate/20140318225328_set_target_for_enterprise_activation.rb
db/migrate/20140318233831_finish_enterprise_activation_for_enabled_enterprises.rb
po/pt/noosfero.po
test/unit/enterprise_activation_test.rb
@@ -96,14 +96,22 @@ class Enterprise &lt; Organization
     save
   end
+  def activation_task
+    self.tasks.where(:type => 'EnterpriseActivation').first
+  end
+
   def enable(owner)
     return if enabled
-    affiliate(owner, Profile::Roles.all_roles(environment.id))
-    update_attribute(:enabled,true)
-    if environment.replace_enterprise_template_when_enable
-      apply_template(template)
-    end
-    save_without_validation!
+    # must be set first for the following to work
+    self.enabled = true
+
+    self.affiliate owner, Profile::Roles.all_roles(self.environment.id) if owner
+
+    self.apply_template template if self.environment.replace_enterprise_template_when_enable
+
+    self.activation_task.update_attribute :status, Task::Status::FINISHED rescue nil
+
+    self.save_without_validation!
   end
   def question
 class EnterpriseActivation < Task
-  class RequestorRequired < Exception; end
+  alias :person :requestor
+  alias :person= :requestor=
-  settings_items :enterprise_id, :integer
+  alias :enterprise :target
+  alias :enterprise= :target=
-  validates_presence_of :enterprise_id
-
-  def enterprise
-    Enterprise.find(enterprise_id)
-  end
-
-  def enterprise=(ent)
-    self.enterprise_id = ent.id
-  end
+  validates_presence_of :enterprise
   def perform
-    raise EnterpriseActivation::RequestorRequired if requestor.nil?
-    self.enterprise.enable(requestor)
+    self.enterprise.enable self.requestor
   end
   def title
@@ -28,15 +21,27 @@ class EnterpriseActivation &lt; Task
   end
   def information
-    {:message => _('%{requestor} wants to activate enterprise %{linked_subject}.')}
+    if self.requestor
+      {:message => _('%{requestor} wants to activate enterprise %{linked_subject}.')}
+    else
+      {:message => _('Pending activation of enterprise %{linked_subject}.')}
+    end
   end
   def icon
-    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+    if self.requestor
+      {:type => :profile_image, :profile => self.requestor, :url => self.requestor.url}
+    else
+      {:type => :profile_image, :profile => self.enterprise, :url => self.enterprise.url}
+    end
   end
   def target_notification_description
-    _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => requestor.name, :enterprise => enterprise.name}
+    if self.requestor
+      _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => self.requestor.name, :enterprise => self.enterprise.name}
+    else
+      _('Pending activation of enterprise %{enterprise}.') % {:enterprise => self.enterprise.name}
+    end
   end
 end
@@ -0,0 +1,13 @@
+class SetTargetForEnterpriseActivation < ActiveRecord::Migration
+  def self.up
+    EnterpriseActivation.find_each do |enterprise_activation|
+      enterprise_activation.target = enterprise_activation.enterprise
+      enterprise_activation.data.delete :enterprise_id
+      enterprise_activation.save
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class FinishEnterpriseActivationForEnabledEnterprises < ActiveRecord::Migration
+  def self.up
+    EnterpriseActivation.find_each do |enterprise_activation|
+      enterprise = enterprise_activation.enterprise
+      next unless enterprise.enabled
+      enterprise_activation.update_attribute :status, Task::Status::FINISHED
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -2815,6 +2815,14 @@ msgstr &quot;%{requestor} quer ativar o empreendimento %{linked_subject}.&quot;
 msgid "%{requestor} wants to activate enterprise %{enterprise}."
 msgstr "%{requestor} quer ativar o empreendimento %{enterprise}."
+#: app/models/enterprise_activation.rb:31
+msgid "Pending activation of enterprise %{linked_subject}."
+msgstr "Ativação pendente para o empreendimento %{linked_subject}."
+
+#: app/models/enterprise_activation.rb:39
+msgid "Pending activation of enterprise %{enterprise}."
+msgstr "Ativação pendente para o empreendimento %{enterprise}."
+
 #: app/models/contact.rb:- app/views/friends/index.rhtml:33
 #: app/views/friends/index.rhtml:36
 msgid "contact"
@@ -9,24 +9,24 @@ class EnterpriseActivationTest &lt; ActiveSupport::TestCase
   end
   should 'keep enterprise_id' do
-    assert_nil EnterpriseActivation.new.enterprise_id
+    assert_nil EnterpriseActivation.new.target_id
   end
   should 'have an enteprise through enterprise_id' do
     ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent')
-    assert_equal ent, EnterpriseActivation.new(:enterprise_id => ent.id).enterprise
+    assert_equal ent, EnterpriseActivation.new(:target => ent).enterprise
   end
   should 'require an enterprise' do
     t = EnterpriseActivation.new
     t.valid?
-    assert t.errors.invalid?(:enterprise_id), "enterprise must be required"
+    assert t.errors.invalid?(:enterprise), "enterprise must be required"
     ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent')
     t.enterprise = ent
     t.valid?
-    assert !t.errors.invalid?(:enterprise_id), "must validate after enterprise is set"
+    assert !t.errors.invalid?(:target_id), "must validate after enterprise is set"
   end
   should 'activate enterprise when finished' do
@@ -40,15 +40,6 @@ class EnterpriseActivationTest &lt; ActiveSupport::TestCase
     assert ent.enabled, "finishing task should left enterprise enabled"
   end
-  should 'require requestor to finish' do
-    ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :enabled => false)
-    t = EnterpriseActivation.create!(:enterprise => ent)
-
-    assert_raise EnterpriseActivation::RequestorRequired do
-      t.finish
-    end
-  end
-
   should 'put requestor as enterprise owner when finishing' do
     ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :enabled => false)
     t = EnterpriseActivation.create!(:enterprise => ent)
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class SetTargetForEnterpriseActivation < ActiveRecord::Migration
	2	+ def self.up
	3	+ EnterpriseActivation.find_each do \|enterprise_activation\|
	4	+ enterprise_activation.target = enterprise_activation.enterprise
	5	+ enterprise_activation.data.delete :enterprise_id
	6	+ enterprise_activation.save
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ say "this migration can't be reverted"
	12	+ end
	13	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class FinishEnterpriseActivationForEnabledEnterprises < ActiveRecord::Migration
	2	+ def self.up
	3	+ EnterpriseActivation.find_each do \|enterprise_activation\|
	4	+ enterprise = enterprise_activation.enterprise
	5	+ next unless enterprise.enabled
	6	+ enterprise_activation.update_attribute :status, Task::Status::FINISHED
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ say "this migration can't be reverted"
	12	+ end
	13	+end
	@@ -2815,6 +2815,14 @@ msgstr "%{requestor} quer ativar o empreendimento %{linked_subject}."		@@ -2815,6 +2815,14 @@ msgstr "%{requestor} quer ativar o empreendimento %{linked_subject}."
2815	msgid "%{requestor} wants to activate enterprise %{enterprise}."	2815	msgid "%{requestor} wants to activate enterprise %{enterprise}."
2816	msgstr "%{requestor} quer ativar o empreendimento %{enterprise}."	2816	msgstr "%{requestor} quer ativar o empreendimento %{enterprise}."
2817		2817
		2818	+#: app/models/enterprise_activation.rb:31
		2819	+msgid "Pending activation of enterprise %{linked_subject}."
		2820	+msgstr "Ativação pendente para o empreendimento %{linked_subject}."
		2821	+
		2822	+#: app/models/enterprise_activation.rb:39
		2823	+msgid "Pending activation of enterprise %{enterprise}."
		2824	+msgstr "Ativação pendente para o empreendimento %{enterprise}."
		2825	+
2818	#: app/models/contact.rb:- app/views/friends/index.rhtml:33	2826	#: app/models/contact.rb:- app/views/friends/index.rhtml:33
2819	#: app/views/friends/index.rhtml:36	2827	#: app/views/friends/index.rhtml:36
2820	msgid "contact"	2828	msgid "contact"