From: Jan Provaznik <jprovazn(a)redhat.com>
---
.../controllers/provider_accounts_controller.rb | 16 +++++++---------
src/features/support/custom.rb | 4 ++--
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/app/controllers/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
index c279996..a5cfb83 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -74,18 +74,16 @@ class ProviderAccountsController < ApplicationController
limit = params[:quota][:maximum_running_instances] if params[:quota]
@provider_account.quota.set_maximum_running_instances(limit)
- if @provider_account.invalid? || !(a)provider_account.valid_credentials?
- flash[:error] = "Credentials are invalid!"
- render :action => 'new' and return
- end
-
@provider_account.pool_families << PoolFamily.default
- @provider_account.save!
- @provider_account.assign_owner_roles(current_user)
- if @provider_account.populate_realms
+ if @provider_account.save
+ @provider_account.assign_owner_roles(current_user)
+ @provider_account.populate_realms
flash[:notice] = "Provider account added."
+ redirect_to provider_account_path(@provider_account)
+ else
+ flash[:error] = "Credentials are invalid!"
+ render :action => 'new' and return
end
- redirect_to provider_account_path(@provider_account)
end
def edit
diff --git a/src/features/support/custom.rb b/src/features/support/custom.rb
index 56afbfa..2f6c459 100644
--- a/src/features/support/custom.rb
+++ b/src/features/support/custom.rb
@@ -13,8 +13,8 @@ ProviderAccount.class_eval do
alias :generate_auth_key_original :generate_auth_key
- def validate_credentials
- true
+ def valid_credentials?
+ credentials_hash['username'].to_s == 'mockuser' &&
credentials_hash['password'].to_s == 'mockpassword'
end
def generate_auth_key
--
1.7.4