Merge show.

SpeciesFileGroup · Sep 17, 2014 · 7784993 · 7784993
2 parents aba2c94 + 379ace1
commit 7784993
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/views/serials/index.html.erb b/app/views/serials/index.html.erb
@@ -6,7 +6,6 @@
       <th>Name</th>
       <th>Created by</th>
       <th>Updated by</th>
-      <th>Project</th>
       <th>Publisher</th>
       <th>Place published</th>
       <th>Primary language</th>
@@ -24,7 +23,6 @@
         <td><%= serial.name %></td>
         <td><%= serial.created_by_id %></td>
         <td><%= serial.updated_by_id %></td>
-        <td><%= serial.project_id %></td>
         <td><%= serial.publisher %></td>
         <td><%= serial.place_published %></td>
         <td><%= serial.primary_language_id %></td>

diff --git a/app/views/shared/data/_show.html.erb b/app/views/shared/data/_show.html.erb
@@ -31,14 +31,14 @@
     <% object.class.reflect_on_all_associations(:has_one).sort { |a, b| a.name <=> b.name }.each do |r| -%>
       <%=  r.name.to_s.humanize -%>
         <%= content_tag(:strong, object_tag(object.send(r.name.to_s))) -%>
-    <br>
+        <br>
     <% end %>
     <h3> Belongs to </h3>
     <% object.class.reflect_on_all_associations(:belongs_to).sort { |a, b| a.name <=> b.name }.each do |r| -%>
       <%=  r.name.to_s.humanize -%>
     <%= content_tag(:strong, object_tag(object.send(r.name.to_s))) -%>
-    <br>
-  <% end %>
+        <br>
+    <% end %>
 
 
   </div>

diff --git a/spec/factories/serial_factory.rb b/spec/factories/serial_factory.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :serial, traits: [:creator_and_updater]  do
     factory :valid_serial do
-      name { 'Serial 1' + Faker::Lorem.sentence }
+      name { 'Serial 1 ' + Faker::Lorem.sentence }
     end
 
     factory :preceding_serial do