Merge branch '1880-check-duplicate-public-key'

[arvados.git] / apps / workbench / app / views / users / index.html.erb

diff --git a/apps/workbench/app/views/users/index.html.erb b/apps/workbench/app/views/users/index.html.erb
index b9230fbd01bc00748276075ad23ac781e79171cf..e29aad53e5389df6d86604941c717b73bfd21878 100644 (file)
--- a/apps/workbench/app/views/users/index.html.erb
+++ b/apps/workbench/app/views/users/index.html.erb
@@ -32,13 +32,13 @@
       </td><td>
         <%= render_editable_attribute u, 'email' %>
       </td><td>
-        <%= render_editable_attribute u, 'is_active', u.is_active ? 'Active' : '', "data-type" => "select", "data-source" => '[{value:1,text:"Active"},{value:0,text:"No"}]' %>
+        <%= render_editable_attribute u, 'is_active', u.is_active ? 'Active' : 'No', "data-type" => "select", "data-source" => '[{value:1,text:"Active"},{value:0,text:"No"}]', "data-value" => u.is_active ? "1" : "0" %>
       </td><td>
-        <%= render_editable_attribute u, 'is_admin', u.is_admin ? 'Admin' : '', "data-type" => "select", "data-source" => '[{value:1,text:"admin"},{value:0,text:"No"}]' %>
+        <%= render_editable_attribute u, 'is_admin', u.is_admin ? 'Admin' : 'No', "data-type" => "select", "data-source" => '[{value:1,text:"admin"},{value:0,text:"No"}]', "data-value" => u.is_admin ? "1" : "0" %>
       </td><td>
-        <%= render_editable_attribute u, 'owner' %>
+        <%= render_editable_attribute u, 'owner_uuid' %>
       </td><td>
-        <%= render_editable_attribute u, 'default_owner' %>
+        <%= render_editable_attribute u, 'default_owner_uuid' %>
       </td>
 
       <td>