Signed-off-by: Scott Seago <[email protected]>
---
src/app/models/cloud_account.rb | 2 +-
src/app/views/cloud_accounts/_form.html.erb | 5 +++--
src/app/views/provider/accounts.html.erb | 2 ++
.../20090801045212_create_cloud_accounts.rb | 1 +
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb
index aaf980e..ca8f31e 100644
--- a/src/app/models/cloud_account.rb
+++ b/src/app/models/cloud_account.rb
@@ -71,7 +71,7 @@ class CloudAccount < ActiveRecord::Base
end
def name
- username
+ label.nil? ? username : label
end
# FIXME: for already-mapped accounts, update rather than add new
diff --git a/src/app/views/cloud_accounts/_form.html.erb
b/src/app/views/cloud_accounts/_form.html.erb
index 0d71953..95f339c 100644
--- a/src/app/views/cloud_accounts/_form.html.erb
+++ b/src/app/views/cloud_accounts/_form.html.erb
@@ -3,10 +3,11 @@
<%= hidden_field :cloud_account, :id %>
<%= hidden_field :cloud_account, :provider_id, :value => @provider.id %>
<ul>
+<li><label>Label<span>user-visible name for the
account</span></label><%=text_field :cloud_account, :label %></li>
<% if @cloud_account.id.nil? %>
-<li><label>UserName<span>UserName for the account you wish to connect to this
pool.</span></label><%= text_field :cloud_account, :username %></li>
+<li><label>UserName<span>UserName for the provider account you wish to
add.</span></label><%= text_field :cloud_account, :username %></li>
<% end %>
-<li><label>Password<span>Password for the account you wish to connect to this
pool.</span></label><%=password_field :cloud_account, :password %></li>
+<li><label>Password<span>Password for the provider account you wish to
add.</span></label><%=password_field :cloud_account, :password %></li>
</ul>
</fieldset>
<%= submit_tag "Save", :class => "submit" %>
diff --git a/src/app/views/provider/accounts.html.erb
b/src/app/views/provider/accounts.html.erb
index 8ce98a8..ca8d287 100644
--- a/src/app/views/provider/accounts.html.erb
+++ b/src/app/views/provider/accounts.html.erb
@@ -4,6 +4,7 @@
<table>
<thead>
<tr>
+ <th scope="col">Label</th>
<th scope="col">Username</th>
<th scope="col"></th>
<th scope="col"></th>
@@ -12,6 +13,7 @@
<tbody>
<%[email protected]_accounts.each {|acct| %>
<tr>
+ <td><%= acct.label %></td>
<td><%= acct.username %></td>
<td><%= link_to "Edit", {:controller => 'cloud_accounts', :action
=> 'edit', :id => acct.id} if has_account_modify?(@provider) %></td>
<td><%= link_to "Delete", {:controller => 'cloud_accounts', :action
=> 'destroy', :id => acct.id} if has_account_modify?(@provider) &&
acct.destroyable? %></td>
diff --git a/src/db/migrate/20090801045212_create_cloud_accounts.rb
b/src/db/migrate/20090801045212_create_cloud_accounts.rb
index 316de87..fb5d2c5 100644
--- a/src/db/migrate/20090801045212_create_cloud_accounts.rb
+++ b/src/db/migrate/20090801045212_create_cloud_accounts.rb
@@ -22,6 +22,7 @@
class CreateCloudAccounts < ActiveRecord::Migration
def self.up
create_table :cloud_accounts do |t|
+ t.string :label
t.string :username, :null => false
t.string :password, :null => false
t.integer :provider_id, :null => false
--
1.6.2.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
