Merge branch 'staging' into production

Leandro Santos
2 parents 0bf5797a 93c7d1c1
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
config/environment.rb
@@ -55,11 +55,11 @@ class TasksController &lt; MyProfileController
  
   def close
     failed = {}
-    save = false
  
     if params[:tasks]
       params[:tasks].each do |id, value|
         decision = value[:decision]
+        save = false
  
         if value[:task].is_a?(Hash) && value[:task][:tag_list]
  
@@ -3,7 +3,7 @@ require_relative &#39;application&#39;
 Noosfero::Application.initialize!
  
 # load a local configuration if present, but not under test environment.
-if ENV['RAILS_ENV'].in? %w[test cucumber]
+unless ENV['RAILS_ENV'].in? %w[test cucumber]
   localconfigfile = Rails.root.join('config', 'local.rb')
   require localconfigfile if File.exists? localconfigfile
 end
...	...	@@ -55,11 +55,11 @@ class TasksController < MyProfileController
55	55
56	56	def close
57	57	failed = {}
58		- save = false
59	58
60	59	if params[:tasks]
61	60	params[:tasks].each do \|id, value\|
62	61	decision = value[:decision]
	62	+ save = false
63	63
64	64	if value[:task].is_a?(Hash) && value[:task][:tag_list]
65	65
...	...
...	...	@@ -3,7 +3,7 @@ require_relative 'application'
3	3	Noosfero::Application.initialize!
4	4
5	5	# load a local configuration if present, but not under test environment.
6		-if ENV['RAILS_ENV'].in? %w[test cucumber]
	6	+unless ENV['RAILS_ENV'].in? %w[test cucumber]
7	7	localconfigfile = Rails.root.join('config', 'local.rb')
8	8	require localconfigfile if File.exists? localconfigfile
9	9	end
...	...