Adapt index views for dependencies and comments

alpinelab · Sep 28, 2018 · 3f30003 · 3f30003
1 parent 211971d
commit 3f30003
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
@@ -23,7 +23,8 @@
 
   <div class="field">
     <%= form.label :dependency_id %>
-    <%= form.text_field :dependency_id %>
+    <%= select_tag(:dependency_id,
+      options_for_select(Dependency.all.map { |d| [d.name, d.id] })) %>
   </div>
 
   <div class="actions">

diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
@@ -17,7 +17,7 @@
       <tr>
         <td><%= comment.body %></td>
         <td><%= comment.published %></td>
-        <td><%= comment.dependency %></td>
+        <td><%= comment.dependency.name %></td>
         <td><%= link_to 'Show', comment %></td>
         <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
         <td><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %></td>
@@ -29,3 +29,4 @@
 <br>
 
 <%= link_to 'New Comment', new_comment_path %>
+<%= link_to "Back to dependencies", dependencies_path %>
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb
@@ -12,7 +12,7 @@
 
 <p>
   <strong>Dependency:</strong>
-  <%= @comment.dependency %>
+  <%= @comment.dependency.name %>
 </p>
 
 <%= link_to 'Edit', edit_comment_path(@comment) %> |

diff --git a/app/views/dependencies/index.html.erb b/app/views/dependencies/index.html.erb
@@ -14,9 +14,12 @@
     <% @dependencies.each do |dependency| %>
       <tr>
         <td><%= dependency.name %></td>
+        <td><%= "#{dependency.comments.count}\
+          #{Comment.model_name.human(count: dependency.comments.count)}" %></td>
         <td><%= link_to 'Show', dependency %></td>
         <td><%= link_to 'Edit', edit_dependency_path(dependency) %></td>
-        <td><%= link_to 'Destroy', dependency, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Destroy', dependency, method: :delete,
+          data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
@@ -25,3 +28,4 @@
 <br>
 
 <%= link_to 'New Dependency', new_dependency_path %>
+<%= link_to "See Comments", comments_path %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1 +1,6 @@
 en:
+  activerecord:
+    models:
+      comment:
+        one: comment
+        other: comments