Download as
Browse Code »

Commit 9f7c80a6f9833f62782aba81d3485cf4021733cc

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 417935cc
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

CreateEnteprise task is cancelled properly 

* The validation is made only after all attributes are updated and
  the identifier uniqueness validation runs only if the task is not
  being cancelled.

(ActionItem1654)
Showing 3 changed files with 16 additions and 2 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @9f7c80a
@@ -16,7 +16,7 @@ class TasksController < MyProfileController @@ -16,7 +16,7 @@ class TasksController < MyProfileController
16 decision = params[:decision] 16 decision = params[:decision]
17 if request.post? && VALID_DECISIONS.include?(decision) && params[:id] 17 if request.post? && VALID_DECISIONS.include?(decision) && params[:id]
18 task = profile.find_in_all_tasks(params[:id]) 18 task = profile.find_in_all_tasks(params[:id])
19 - task.update_attributes!(params[:task]) 19 + task.update_attributes(params[:task])
20 begin 20 begin
21 task.send(decision) 21 task.send(decision)
22 rescue Exception => ex 22 rescue Exception => ex
app/models/create_enterprise.rb
  Diff comments   View file @9f7c80a
@@ -59,7 +59,7 @@ class CreateEnterprise < Task @@ -59,7 +59,7 @@ class CreateEnterprise < Task
59 end 59 end
60 end 60 end
61 61
62 - if self.identifier && Profile.exists?(:identifier => self.identifier) 62 + if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
63 self.errors.add(:identifier, '%{fn} is already being as identifier by another enterprise, organization or person.') 63 self.errors.add(:identifier, '%{fn} is already being as identifier by another enterprise, organization or person.')
64 end 64 end
65 end 65 end
test/functional/tasks_controller_test.rb
  Diff comments   View file @9f7c80a
@@ -223,4 +223,18 @@ class TasksControllerTest < Test::Unit::TestCase @@ -223,4 +223,18 @@ class TasksControllerTest < Test::Unit::TestCase
223 assert_includes c_blog2.children(true), p_article 223 assert_includes c_blog2.children(true), p_article
224 end 224 end
225 225
  226 + should 'cancel an enterprise registration task even if there is an enterprise with the same identifier' do
  227 + e = Environment.default
  228 + e.add_admin(profile)
  229 + task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => profile, :target => e)
  230 + enterprise = fast_create(Enterprise, :name => "My Enterprise", :identifier => "my-enterprise")
  231 +
  232 + assert_nothing_raised do
  233 + post :close, {:profile => profile.identifier, :id => task.id, :task => {:reject_explanation => "Bla bla"}, :decision => "cancel"}
  234 + end
  235 +
  236 + task.reload
  237 + assert_equal Task::Status::CANCELLED, task.status
  238 + end
  239 +
226 end 240 end