displays already set UTBCredentials in form

this closes #18
wisebed · Jan 15, 2013 · 0c9ea28 · 0c9ea28
1 parent d71517d
commit 0c9ea28
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -70,13 +70,15 @@ def update
       existing_credentials.each { |co|
         # updating existing credentials
         if co.testbed == for_testbed
-          co.username = h[:username]
-          co.password = h[:password]
-          co.save
+          if h[:password].gsub("*","").length > 0
+            co.username = h[:username]
+            co.password = h[:password]
+            co.save
+          end
           updated = true
         end
       }
-      if (not updated) and h[:username].length > 0
+      if (not updated) and h[:password].gsub("*","").length > 0
         # the supplied credentials where not updated => create new object
         new_utc = UserTestbedCredential.new(:testbed_id => for_testbed.id,
                                             :username => h[:username],

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
@@ -14,7 +14,7 @@
     <% if @user.github_uid %>
         <%# if user comes from github, just make a button to update his account
     via a github api request or whatever... %>
-        changes to users with github account are not (yet) possible! <br/>
+        <strong>Sorry</strong>, changes to users with github account are not (yet) possible! <br/>
     <% else %>
         <div class="field">
           <%= f.label :name %>
@@ -40,16 +40,20 @@
 
     <hr>
     Change your testbed credentials here: username, password <br/>
-    <% @testbeds = Testbed.all.inject(Hash.new) { |h, tb| h[tb.shortname] = tb.name; h } %>
-    <% @testbeds.each do |shortname, name| %>
+    <% Testbed.all.each do |tb| %>
+        <%
+           users_credentials_for_current_testbed = UserTestbedCredential.where(:user_id => @user.id, :testbed_id => tb.id).first
+           user_username = users_credentials_for_current_testbed.nil? ? "" : users_credentials_for_current_testbed.username
+           user_password = users_credentials_for_current_testbed.nil? ? "" : "*"*12
+        %>
 
         <%= fields_for UserTestbedCredential.new do |testbed_fields| %>
-            <div class="testbedform" id="<%= shortname %>">
+            <div class="testbedform" id="<%= tb.shortname %>">
               <div class="field">
-                <%= testbed_fields.label name %>
-                <%= testbed_fields.hidden_field :shortname, :name => "[credentials][#{shortname}][shortname]", :value => shortname %>
-                <%= testbed_fields.text_field :username, :name => "[credentials][#{shortname}][username]" %>
-                <%= testbed_fields.password_field :password, :name => "[credentials][#{shortname}][password]" %>
+                <%= testbed_fields.label tb.name %>
+                <%= testbed_fields.hidden_field :shortname, :name => "[credentials][#{tb.shortname}][shortname]", :value => tb.shortname %>
+                <%= testbed_fields.text_field :username, :name => "[credentials][#{tb.shortname}][username]", :value => user_username %>
+                <%= testbed_fields.password_field :password, :name => "[credentials][#{tb.shortname}][password]", :value => user_password %>
               </div>
             </div>
         <% end %>