diff --git a/app/controllers/enterprise_controller.rb b/app/controllers/enterprise_controller.rb index c59e067..15e1570 100644 --- a/app/controllers/enterprise_controller.rb +++ b/app/controllers/enterprise_controller.rb @@ -104,6 +104,7 @@ class EnterpriseController < ApplicationController redirect_to :action => 'index' end + # Rejects an enterprise def reject @enterprise = Enterprise.find(params[:id]) if @enterprise.reject diff --git a/app/views/enterprise/show.rhtml b/app/views/enterprise/show.rhtml index 4add7dc..8b7f0be 100644 --- a/app/views/enterprise/show.rhtml +++ b/app/views/enterprise/show.rhtml @@ -23,3 +23,9 @@ <%= help _('Be a member of the enterprise') %> <%= link_to _('Activate'), :action => 'activate', :id => @enterprise if @my_pending_enterprises.include?(@enterprise) %> <%= help _('Activate an approved enterprise') if @my_pending_enterprises.include?(@enterprise) %> +<% unless @enterprise.approved? %> + <%= link_to _('Approve'), :action => 'approve', :id => @enterprise %> + <%= help _('Approve a submitted enterprise profile') %> + <%= link_to _('Reject'), :action => 'reject', :id => @enterprise %> + <%= help _('Reject a submitted enterprise profile') %> +<% end %> diff --git a/test/functional/enterprise_controller_test.rb b/test/functional/enterprise_controller_test.rb index 4133dd5..d4fd6c9 100644 --- a/test/functional/enterprise_controller_test.rb +++ b/test/functional/enterprise_controller_test.rb @@ -137,4 +137,10 @@ class EnterpriseControllerTest < Test::Unit::TestCase assert_kind_of Enterprise, assigns(:enterprise) assert assigns(:enterprise).active end + + def test_approve + logins_as 'ze' + post :approve, :id => 5 + assert assigns(:em) + end end diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb index 0691c6e..2b84f41 100644 --- a/test/unit/enterprise_test.rb +++ b/test/unit/enterprise_test.rb @@ -46,6 +46,20 @@ class EnterpriseTest < Test::Unit::TestCase end end + def test_approve + e = Enterprise.create(:identifier => 'bli', :name => 'Bli') + assert !e.approved? + e.approve + assert e.approved? + end + + def test_reject + e = Enterprise.create(:identifier => 'bli', :name => 'Bli') + assert !e.rejected? + e.reject + assert e.rejected? + end + def test_cannot_be_activated_without_approval e = Enterprise.create(:identifier => 'bli', :name => 'Bli') assert !e.approved -- libgit2 0.21.2