From ecf5b5a2c15ce8d83f855645a7ec8e497a8c6146 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Fri, 29 Jul 2016 16:46:25 +0200
Subject: [PATCH] Feed the Hound

---
 app/controllers/my_modules_controller.rb   |  4 +---
 app/helpers/secondary_navigation_helper.rb | 26 +++++++++++-----------
 app/helpers/sidebar_helper.rb              |  2 +-
 app/models/project.rb                      |  2 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index fbcec69e2..b4ce93556 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -310,9 +310,7 @@ class MyModulesController < ApplicationController
     @my_module = MyModule.find_by_id(params[:id])
     if @my_module
       @experiment = @my_module.experiment
-      if @experiment
-        @project = @my_module.experiment.project
-      end
+      @project = @my_module.experiment.project if @experiment
     else
       render_404
     end
diff --git a/app/helpers/secondary_navigation_helper.rb b/app/helpers/secondary_navigation_helper.rb
index ede4746e8..41e7129c4 100644
--- a/app/helpers/secondary_navigation_helper.rb
+++ b/app/helpers/secondary_navigation_helper.rb
@@ -1,54 +1,54 @@
 module SecondaryNavigationHelper
 
   def is_project_info?
-    action_name == "show"
+    action_name == 'show'
   end
 
   def is_project_show?
-    action_name == "show"
+    action_name == 'show'
   end
 
   def is_project_samples?
-    action_name == "samples"
+    action_name == 'samples'
   end
 
   def is_project_reports?
-    controller_name == "reports" and action_name == "index"
+    controller_name == 'reports' and action_name == 'index'
   end
 
   def is_project_archive?
-    action_name == "experiment_archive"
+    action_name == 'experiment_archive'
   end
 
   def is_experiment_canvas?
-    action_name == "canvas"
+    action_name == 'canvas'
   end
 
   def is_experiment_archive?
-    action_name == "module_archive"
+    action_name == 'module_archive'
   end
 
   def is_module_info?
-    action_name == "show"
+    action_name == 'show'
   end
 
   def is_module_protocols?
-    action_name == "protocols"
+    action_name == 'protocols'
   end
 
   def is_module_results?
-    action_name == "results"
+    action_name == 'results'
   end
 
   def is_module_activities?
-    action_name == "activities"
+    action_name == 'activities'
   end
 
   def is_module_samples?
-    action_name == "samples"
+    action_name == 'samples'
   end
 
   def is_module_archive?
-    action_name == "archive"
+    action_name == 'archive'
   end
 end
diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb
index b706172ab..d1e13ebd2 100644
--- a/app/helpers/sidebar_helper.rb
+++ b/app/helpers/sidebar_helper.rb
@@ -21,7 +21,7 @@ module SidebarHelper
 
   def experiment_action_to_link_to(experiment)
     # TODO
-    return canvas_experiment_path(experiment)
+    canvas_experiment_path(experiment)
   end
 
   def module_action_to_link_to(my_module)
diff --git a/app/models/project.rb b/app/models/project.rb
index 62bac664d..e4fd29c8c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -105,7 +105,7 @@ class Project < ActiveRecord::Base
   end
 
   def active_experiments
-    self.experiments.is_archived(false)
+    experiments.is_archived(false)
   end
 
   def project_my_modules