Fix nav

Resolves #44
pikesley · Jan 30, 2016 · a43444c · a43444c
1 parent 6c9e14a
commit a43444c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -12,4 +12,14 @@ def date_sift measurements
 
     h
   end
+
+  def models
+    [
+      GlucoseMeasurement,
+      CarbohydrateIntake,
+      MedicationEvent,
+      PhysicalExercise
+    ]
+  end
+
 end
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
@@ -13,12 +13,10 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class='collapse navbar-collapse' id='navbar-collapse'>
       <ul class='nav navbar-nav' role='tablist'>
-        <% if @models %>
-          <% @models.each do |model| %>
-            <li>
-              <%= link_to model.short_name, send("#{model.name.underscore}s_path") %>
-            </li>
-          <% end %>
+        <% models.each do |model| %>
+          <li>
+            <%= link_to model.short_name, send("#{model.name.underscore}s_path") %>
+          </li>
         <% end %>
       </ul>
       <p class="navbar-text navbar-right">

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -1,10 +1,3 @@
-<% @models = [
-  GlucoseMeasurement,
-  CarbohydrateIntake,
-  MedicationEvent,
-  PhysicalExercise
-] %>
-
-<% @models.each do |model| %>
+<% models.each do |model| %>
   <%= link_to model.short_name, send("#{model.name.underscore}s_path"), class: 'btn btn-success' %>
 <% end %>