From 9d23cfd9407eac9b221e7eab5e75c9f9f065de79 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Thu, 28 Jul 2016 11:30:34 +0200
Subject: [PATCH] fixed experiment routes

---
 app/controllers/canvas_controller.rb       |  2 +-
 app/controllers/experiments_controller.rb  |  4 ++--
 app/views/projects/index/_project.html.erb |  2 +-
 app/views/shared/_sidebar.html.erb         |  2 +-
 config/routes.rb                           | 24 ++++++++++++----------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb
index abc4197ed..92c655c8e 100644
--- a/app/controllers/canvas_controller.rb
+++ b/app/controllers/canvas_controller.rb
@@ -232,7 +232,7 @@ class CanvasController < ApplicationController
     end
 
     flash[:success] = t(
-      "experiments.canvas.update.success_flash")
+      "projects.canvas.update.success_flash")
     redirect_to canvas_experiment_path(@experiment)
   end
 
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 5bab96d56..6828f2cd8 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -5,7 +5,7 @@ class ExperimentsController < ApplicationController
 
   # except parameter could be used but it is not working.
   layout :choose_layout
-  
+
   def new
     @experiment = Experiment.new
   end
@@ -65,7 +65,7 @@ class ExperimentsController < ApplicationController
   end
 
   def set_project
-    @project = Project.find_by_id(params[:project_id])
+    @project = @experiment.project
   end
 
   def experiment_params
diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb
index b069ab79b..d46293f6a 100644
--- a/app/views/projects/index/_project.html.erb
+++ b/app/views/projects/index/_project.html.erb
@@ -33,7 +33,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
         <span class="glyphicon glyphicon-eye-open" aria-hidden="true" title="<%=t "projects.index.visibility_public" %>"></span>
       <% end %>
       <% if can_view_project(project) then %>
-        <%= link_to project.name, canvas_project_path(project), id: "#{project.id}-project-canvas-link"  %>
+        <%#= link_to project.name, canvas_project_path(project), id: "#{project.id}-project-canvas-link"  %>
       <% else %>
         <%= project.name %>
       <% end %>
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index ba1328069..d0bde1ade 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -24,7 +24,7 @@
             <% end %>
           </span>
           <ul>
-            <li class="<%= 'active' if not is_module_page? %>" >
+            <li>
               <span class="tree-link line-wrap">
                 <i></i>
                   <span title="<%= @experiment.name %>"><%= @experiment.name %></span>
diff --git a/config/routes.rb b/config/routes.rb
index 9ec7bbcbe..2bf2bdf56 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,21 +89,11 @@ Rails.application.routes.draw do
       end
     end
     resources :experiments, only: [:new, :create, :edit, :update, :archive]
-    resources :experiments, shallow: true, only: [:show] do
-      member do
-        get 'canvas' # Overview/structure for single project
-        get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas)
-        get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom
-        get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom
-        get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom
-        post 'canvas', to: 'canvas#update' # Save updated canvas action
-      end
-    end
     member do
       get 'notifications' # Notifications popup for individual project in projects index
       get 'samples' # Samples for single project
-      get 'module_archive' # Module archive for single project
       post 'samples_index' # Renders sample datatable for single project (ajax action)
+      get 'experiment_archive' # Experiment archive for single project
       post :delete_samples, constraints: CommitParamRouting.new(MyModulesController::DELETE_SAMPLES), action: :delete_samples
     end
 
@@ -111,6 +101,18 @@ Rails.application.routes.draw do
     get 'users/edit', to: 'user_projects#index_edit'
   end
 
+  resources :experiments, only: [:show] do
+    member do
+      get 'canvas' # Overview/structure for single project
+      get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas)
+      get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom
+      get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom
+      get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom
+      post 'canvas', to: 'canvas#update' # Save updated canvas action
+      get 'module_archive' # Module archive for single project
+    end
+  end
+
   # Show action is a popup (JSON) for individual module in full-zoom canvas,
   # as well as "module info" page for single module (HTML)
   resources :my_modules, path: "/modules", only: [:show, :edit, :update, :destroy] do