merging with master

Leandro Santos
2 parents 3efd8287 24429b78
Showing 5 changed files with 39 additions and 9 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
app/models/task.rb
db/migrate/20150602142030_add_closed_by_to_task.rb
test/functional/tasks_controller_test.rb
test/unit/task_test.rb
@@ -65,7 +65,7 @@ class TasksController &lt; MyProfileController
             task ||= profile.find_in_all_tasks(id)
             begin
               task.update_attributes(value[:task])
-              task.send(decision)
+              task.send(decision, current_person)
             rescue Exception => ex
               message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
               failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
@@ -35,6 +35,7 @@ class Task &lt; ActiveRecord::Base
   belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
   belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
+  belongs_to :closed_by, :class_name => 'Person', :foreign_key => :closed_by_id
  
   validates_uniqueness_of :code, :on => :create
   validates_presence_of :code
@@ -78,11 +79,9 @@ class Task &lt; ActiveRecord::Base
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
-  def finish
+  def finish(closed_by=nil)
     transaction do
-      self.status = Task::Status::FINISHED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::FINISHED, closed_by)
       self.perform
       begin
         send_notification(:finished)
@@ -107,11 +106,9 @@ class Task &lt; ActiveRecord::Base
  
   # this method cancels the task. At the end a message (as returned by
   # #cancel_message) is sent to the requestor with #notify_requestor.
-  def cancel
+  def cancel(closed_by=nil)
     transaction do
-      self.status = Task::Status::CANCELLED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::CANCELLED, closed_by)
       begin
         send_notification(:cancelled)
       rescue NotImplementedError => ex
@@ -120,6 +117,13 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
+  def close(status, closed_by)
+    self.status = status
+    self.end_date = Time.now
+    self.closed_by = closed_by
+    self.save!
+  end
+
   # Here are the tasks customizable options.
  
   def title
@@ -0,0 +1,7 @@
+class AddClosedByToTask < ActiveRecord::Migration
+
+  def change
+    add_column :tasks, :closed_by_id, :integer
+  end
+
+end
@@ -679,6 +679,12 @@ class TasksControllerTest &lt; ActionController::TestCase
  
     assert_select ".task_responsible select", 0
     assert_select ".task_responsible .value"
+  end 
+
+  should 'store the person who closes a task' do
+    t = profile.tasks.build; t.save!
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
+    assert_equal profile, t.reload.closed_by
   end
  
   should 'save task tags' do
@@ -485,7 +485,20 @@ class TaskTest &lt; ActiveSupport::TestCase
  
     assert_includes task_one.tags_from(nil), 'test'
     assert_not_includes task_two.tags_from(nil), 'noosfero'
+  end
  
+  should 'store who finish the task' do
+    t = Task.create
+    person = fast_create(Person)
+    t.finish(person)
+    assert_equal person, t.reload.closed_by
+  end
+
+  should 'store who cancel the task' do
+    t = Task.create
+    person = fast_create(Person)
+    t.cancel(person)
+    assert_equal person, t.reload.closed_by
   end
  
   protected
...	...	@@ -65,7 +65,7 @@ class TasksController < MyProfileController
65	65	task \|\|= profile.find_in_all_tasks(id)
66	66	begin
67	67	task.update_attributes(value[:task])
68		- task.send(decision)
	68	+ task.send(decision, current_person)
69	69	rescue Exception => ex
70	70	message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
71	71	failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
...	...
...	...	@@ -35,6 +35,7 @@ class Task < ActiveRecord::Base
35	35	belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
36	36	belongs_to :target, :foreign_key => :target_id, :polymorphic => true
37	37	belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
	38	+ belongs_to :closed_by, :class_name => 'Person', :foreign_key => :closed_by_id
38	39
39	40	validates_uniqueness_of :code, :on => :create
40	41	validates_presence_of :code
...	...	@@ -78,11 +79,9 @@ class Task < ActiveRecord::Base
78	79	# this method finished the task. It calls #perform, which must be overriden
79	80	# by subclasses. At the end a message (as returned by #finish_message) is
80	81	# sent to the requestor with #notify_requestor.
81		- def finish
	82	+ def finish(closed_by=nil)
82	83	transaction do
83		- self.status = Task::Status::FINISHED
84		- self.end_date = Time.now
85		- self.save!
	84	+ close(Task::Status::FINISHED, closed_by)
86	85	self.perform
87	86	begin
88	87	send_notification(:finished)
...	...	@@ -107,11 +106,9 @@ class Task < ActiveRecord::Base
107	106
108	107	# this method cancels the task. At the end a message (as returned by
109	108	# #cancel_message) is sent to the requestor with #notify_requestor.
110		- def cancel
	109	+ def cancel(closed_by=nil)
111	110	transaction do
112		- self.status = Task::Status::CANCELLED
113		- self.end_date = Time.now
114		- self.save!
	111	+ close(Task::Status::CANCELLED, closed_by)
115	112	begin
116	113	send_notification(:cancelled)
117	114	rescue NotImplementedError => ex
...	...	@@ -120,6 +117,13 @@ class Task < ActiveRecord::Base
120	117	end
121	118	end
122	119
	120	+ def close(status, closed_by)
	121	+ self.status = status
	122	+ self.end_date = Time.now
	123	+ self.closed_by = closed_by
	124	+ self.save!
	125	+ end
	126	+
123	127	# Here are the tasks customizable options.
124	128
125	129	def title
...	...
...	...	@@ -0,0 +1,7 @@
	1	+class AddClosedByToTask < ActiveRecord::Migration
	2	+
	3	+ def change
	4	+ add_column :tasks, :closed_by_id, :integer
	5	+ end
	6	+
	7	+end
...	...
...	...	@@ -679,6 +679,12 @@ class TasksControllerTest < ActionController::TestCase
679	679
680	680	assert_select ".task_responsible select", 0
681	681	assert_select ".task_responsible .value"
	682	+ end
	683	+
	684	+ should 'store the person who closes a task' do
	685	+ t = profile.tasks.build; t.save!
	686	+ post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
	687	+ assert_equal profile, t.reload.closed_by
682	688	end
683	689
684	690	should 'save task tags' do
...	...
...	...	@@ -485,7 +485,20 @@ class TaskTest < ActiveSupport::TestCase
485	485
486	486	assert_includes task_one.tags_from(nil), 'test'
487	487	assert_not_includes task_two.tags_from(nil), 'noosfero'
	488	+ end
488	489
	490	+ should 'store who finish the task' do
	491	+ t = Task.create
	492	+ person = fast_create(Person)
	493	+ t.finish(person)
	494	+ assert_equal person, t.reload.closed_by
	495	+ end
	496	+
	497	+ should 'store who cancel the task' do
	498	+ t = Task.create
	499	+ person = fast_create(Person)
	500	+ t.cancel(person)
	501	+ assert_equal person, t.reload.closed_by
489	502	end
490	503
491	504	protected
...	...