[PATCH 6/6] Re-arrange some of the kick_condor statements in the controller.

[Chris Lalancette]

There were a couple of places that the kick_condor was in the
wrong place, and a couple of places that were missing kick_condor.
Fix these up so we kick condor_refreshd at the right times.

Signed-off-by: Chris Lalancette 
---
 .../admin/provider_accounts_controller.rb          |    1 +
 src/app/controllers/admin/providers_controller.rb  |    4 ++--
 .../image_factory/image_imports_controller.rb      |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/admin/provider_accounts_controller.rb b/src/app/controllers/admin/provider_accounts_controller.rb
index 6835432..01aa549 100644
--- a/src/app/controllers/admin/provider_accounts_controller.rb
+++ b/src/app/controllers/admin/provider_accounts_controller.rb
@@ -125,6 +125,7 @@ class Admin::ProviderAccountsController < ApplicationController
     unless failed.empty?
       flash[:error] = t 'provider_accounts.index.account_not_deleted', :count => failed.length, :list => failed.join(', ')
     end
+    kick_condor
     redirect_to admin_provider_accounts_url
   end

diff --git a/src/app/controllers/admin/providers_controller.rb b/src/app/controllers/admin/providers_controller.rb
index 8a7c0c8..16e07de 100644
--- a/src/app/controllers/admin/providers_controller.rb
+++ b/src/app/controllers/admin/providers_controller.rb
@@ -19,7 +19,6 @@ class Admin::ProvidersController < ApplicationController
   def new
     require_privilege(Privilege::CREATE, Provider)
     @provider = Provider.new
-    kick_condor
   end

def edit
@@ -92,14 +91,15 @@ class Admin::ProvidersController < ApplicationController
         flash[:notice] = "Cannot update the provider."
         render :action => 'edit'
       end
+      kick_condor
     end
-    kick_condor
   end

def multi_destroy
     Provider.find(params[:provider_selected]).each do |provider|
       provider.destroy if check_privilege(Privilege::MODIFY, provider)
     end
+    kick_condor
     redirect_to admin_providers_url
   end

diff --git a/src/app/controllers/image_factory/image_imports_controller.rb b/src/app/controllers/image_factory/image_imports_controller.rb
index cd25f31..1d52891 100644
--- a/src/app/controllers/image_factory/image_imports_controller.rb
+++ b/src/app/controllers/image_factory/image_imports_controller.rb
@@ -10,6 +10,7 @@ class ImageFactory::ImageImportsController < ApplicationController
       Image.import(ProviderAccount.find(params[:provider_account_id]), params[:ami_id])
       flash[:notice]="Image successfully imported"
       redirect_to image_factory_templates_path
+      kick_condor
     rescue => e
       init_provider_vars
       flash.now[:error]=e.message