basic user editing

2 files changed, 13 insertions, 3 deletions

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 5b73242..dae13ce 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -24,7 +24,7 @@
   </tr>
   <tr>
     <td class="description"></td>
-    <td class="right"><%= f.submit "Create" %></td>
+    <td class="right"><%= f.submit "Update" %></td>
   </tr>
 </table>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8526d84..03085c1 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,9 +2,19 @@
 
 <table id="user_list">
   <tr>
-    <td>login</td>
+    <th>login</th>
   </tr>
-  <%= user_list_by_admin_status %>
+  <% @users.each do |user| %>
+  <tr>
+    <td><%= user.login %></td>
+    <td><%= link_to "show", user_path(user) %></td>
+    <td>
+    <% if current_user == user || current_user.admin? %>
+      <%= link_to "Edit", edit_user_path(user) %>
+    <% end %>
+    </td>
+  </tr>
+  <% end %>
 </table>