From: Jiri Tomasek <jtomasek(a)redhat.com>
Re-seeding is necessary after this patch is applied!
---
src/app/models/provider_account.rb | 2 +-
.../provider_accounts/_provider_form.html.haml | 2 +-
src/config/locales/en.yml | 8 ++++++++
src/db/seeds.rb | 14 +++++++-------
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
index d0323a9..232928e 100644
--- a/src/app/models/provider_account.rb
+++ b/src/app/models/provider_account.rb
@@ -81,7 +81,7 @@ class ProviderAccount < ActiveRecord::Base
def validate_presence_of_credentials
provider.provider_type.credential_definitions.each do |cd|
- errors.add(:base, "#{cd.label} can't be blank") if
credentials_hash[cd.name].blank?
+ errors.add(:base,
"#{I18n.t("provider_accounts.credentials.labels.#{cd.label}")}
#{I18n.t('errors.messages.blank')}") if credentials_hash[cd.name].blank?
end
end
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml
b/src/app/views/provider_accounts/_provider_form.html.haml
index 20aa089..158f99d 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -5,7 +5,7 @@
- @provider_account.all_credentials((a)provider).each do |cred|
- if cred_order == cred.credential_definition.name
%p.clearfix
- = label_tag cred.credential_definition.label
+ = label_tag
t("provider_accounts.credentials.labels.#{cred.credential_definition.label}")
- if cred.credential_definition.input_type == "password"
= password_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
- elsif cred.credential_definition.input_type == "file"
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 4050e0b..e2ee899 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1077,6 +1077,14 @@ en:
permissions: Permissions
credentials:
credentials_for: Credentials for
+ labels:
+ username: 'Username'
+ password: 'Password'
+ access_key: 'Access Key'
+ secret_access_key: 'Secret Access Key'
+ account_number: 'Account Number'
+ key: 'Key'
+ certificate: 'Certificate'
history:
history_for: History for
list:
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index 03aff0e..e4f5745 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -181,16 +181,16 @@ end
if CredentialDefinition.all.empty?
ProviderType.all.each do |provider_type|
unless provider_type.deltacloud_driver == 'ec2'
- CredentialDefinition.create!(:name => 'username', :label =>
'Username', :input_type => 'text', :provider_type_id =>
provider_type.id)
- CredentialDefinition.create!(:name => 'password', :label =>
'Password', :input_type => 'password', :provider_type_id =>
provider_type.id)
+ CredentialDefinition.create!(:name => 'username', :label =>
'username', :input_type => 'text', :provider_type_id =>
provider_type.id)
+ CredentialDefinition.create!(:name => 'password', :label =>
'password', :input_type => 'password', :provider_type_id =>
provider_type.id)
end
end
#for ec2 provider type
ec2 = ProviderType.find_by_deltacloud_driver 'ec2'
- CredentialDefinition.create!(:name => 'username', :label => 'Access
Key', :input_type => 'text', :provider_type_id => ec2.id)
- CredentialDefinition.create!(:name => 'password', :label => 'Secret
Access Key', :input_type => 'password', :provider_type_id => ec2.id)
- CredentialDefinition.create!(:name => 'account_id', :label =>
'Account Number', :input_type => 'text', :provider_type_id =>
ec2.id)
- CredentialDefinition.create!(:name => 'x509private', :label =>
'Key', :input_type => 'file', :provider_type_id => ec2.id)
- CredentialDefinition.create!(:name => 'x509public', :label =>
'Certificate', :input_type => 'file', :provider_type_id => ec2.id)
+ CredentialDefinition.create!(:name => 'username', :label =>
'access_key', :input_type => 'text', :provider_type_id => ec2.id)
+ CredentialDefinition.create!(:name => 'password', :label =>
'secret_access_key', :input_type => 'password', :provider_type_id =>
ec2.id)
+ CredentialDefinition.create!(:name => 'account_id', :label =>
'account_number', :input_type => 'text', :provider_type_id =>
ec2.id)
+ CredentialDefinition.create!(:name => 'x509private', :label =>
'key', :input_type => 'file', :provider_type_id => ec2.id)
+ CredentialDefinition.create!(:name => 'x509public', :label =>
'certificate', :input_type => 'file', :provider_type_id => ec2.id)
end
--
1.7.7.6