Download as
Browse Code »

Commit db1140eeb5c93b8d7bfe5ebaad86c03f9924a0bc

Authored by AntonioTerceiro
1 parent 51f9397d
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem16: changing the access to individual pending validation by code 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@865 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/controllers/profile_admin/enterprise_validation_controller.rb
  Diff comments   View file @db1140e
@@ -5,7 +5,7 @@ class EnterpriseValidationController < ProfileAdminController @@ -5,7 +5,7 @@ class EnterpriseValidationController < ProfileAdminController
5 end 5 end
6 6
7 def details 7 def details
8 - @pending = profile.pending_validations(:code => params[:id]).first 8 + @pending = profile.find_pending_validation(params[:id])
9 unless @pending 9 unless @pending
10 render_not_found 10 render_not_found
11 end 11 end
test/functional/enterprise_validation_test.rb
  Diff comments   View file @db1140e
@@ -28,14 +28,14 @@ all_fixtures @@ -28,14 +28,14 @@ all_fixtures
28 28
29 should 'display details and prompt for needed data when approving or rejecting enterprise' do 29 should 'display details and prompt for needed data when approving or rejecting enterprise' do
30 validating = CreateEnterprise.new 30 validating = CreateEnterprise.new
31 - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([validating]) 31 + @org.expects(:find_pending_validation).with('kakakaka').returns(validating)
32 32
33 get :details, :profile => 'myorg', :id => 'kakakaka' 33 get :details, :profile => 'myorg', :id => 'kakakaka'
34 assert_same validating, assigns(:pending) 34 assert_same validating, assigns(:pending)
35 end 35 end
36 36
37 should 'refuse to validate unexisting request' do 37 should 'refuse to validate unexisting request' do
38 - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([]) 38 + @org.expects(:find_pending_validation).with('kakakaka').returns(nil)
39 get :details , :profile => 'myorg', :id => 'kakakaka' 39 get :details , :profile => 'myorg', :id => 'kakakaka'
40 assert_response 404 40 assert_response 404
41 end 41 end