From 58d8414f92fdec53cb944177a62faf1346f0e4f5 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Fri, 1 Jun 2018 15:05:12 +0200
Subject: [PATCH] Code fixes for sidebar [SCI-2478]

---
 app/controllers/projects_controller.rb        | 2 +-
 app/views/projects/index.html.erb             | 2 +-
 app/views/shared/sidebar/_my_modules.html.erb | 4 +++-
 app/views/shared/sidebar/_projects.html.erb   | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8371ed9b0..433a5a048 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -10,7 +10,7 @@ class ProjectsController < ApplicationController
                                      samples experiment_archive
                                      delete_samples samples_index)
   before_action :load_projects_tree, only: %i(index show samples archive
-                                                  experiment_archive)
+                                              experiment_archive)
   before_action :load_archive_vars, only: :archive
   before_action :check_view_permissions, only: %i(show reports notifications
                                                   samples experiment_archive
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index a5af87fe9..fda5efe5c 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -84,7 +84,7 @@
             <ul class="dropdown-menu" aria-labelledby="sortMenu">
             <% ["new", "old", "atoz", "ztoa"].each do |sort| %>
               <% if @current_sort != sort %>
-              <li><a href="?<%= {team: @current_team_id, sort: sort}.reject{|k,v| v.to_s == "0"}.to_query %>"><%= t('projects.index.sort_' + sort) %></a></li>
+              <li><a href="?<%= {team: @current_team.id, sort: sort}.reject{|k,v| v.to_s == "0"}.to_query %>"><%= t('projects.index.sort_' + sort) %></a></li>
               <% else %>
               <li class="disabled"><a href="#"><%= t('projects.index.sort_' + sort) %></a></li>
               <% end %>
diff --git a/app/views/shared/sidebar/_my_modules.html.erb b/app/views/shared/sidebar/_my_modules.html.erb
index 44ca16efd..b286ad020 100644
--- a/app/views/shared/sidebar/_my_modules.html.erb
+++ b/app/views/shared/sidebar/_my_modules.html.erb
@@ -1,6 +1,7 @@
 <% if experiment.active_my_modules.present? %>
   <ul>
-    <% experiment.active_my_modules.each do |my_module| %>
+    <% experiment.active_my_modules.sort_by{ |m| m.workflow_order }.each do |my_module| %>
+
       <li class="leaf <%= "active" if currently_active? my_module %>"
            data-module-id="<%= my_module.id %>">
         <span class="tree-link second-indent">
@@ -14,6 +15,7 @@
           <% end %>
         </span>
       </li>
+
     <% end %>
   </ul>
 <% end %>
diff --git a/app/views/shared/sidebar/_projects.html.erb b/app/views/shared/sidebar/_projects.html.erb
index fc099de18..ab32806dc 100644
--- a/app/views/shared/sidebar/_projects.html.erb
+++ b/app/views/shared/sidebar/_projects.html.erb
@@ -1,9 +1,7 @@
 <ul>
   <% if @projects_tree.present? then %>
     <% @projects_tree.each do |project| %>
-      <% if (project_page? ||
-             sample_types_page_project? ||
-             sample_groups_page_project?) && project == @project %>
+      <% if project_page? && project == @project %>
         <li class="active" data-parent="candidate">
           <span class="tree-link line-wrap no-indent">
             <i class="no-arrow"></i>