From 21b4ba7627ceba4850e66cad4b3c63a394b5fc5b Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Wed, 28 Jun 2017 17:15:09 +0200
Subject: [PATCH 1/4] fix bugs on projects page

---
 app/assets/javascripts/application.js.erb    |  1 -
 app/views/user_projects/_index.html.erb      | 11 ++++++-----
 app/views/user_projects/_index_edit.html.erb | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 240899728..fcea01b3b 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -60,7 +60,6 @@ function initFormSubmitLinks(el) {
 }
 
 /* Enable loading bars */
-Turbolinks.enableProgressBar();
 $(document)
   .bind("ajaxSend", function(){
     animateLoading();
diff --git a/app/views/user_projects/_index.html.erb b/app/views/user_projects/_index.html.erb
index 2956ce50c..57498aa97 100644
--- a/app/views/user_projects/_index.html.erb
+++ b/app/views/user_projects/_index.html.erb
@@ -4,18 +4,19 @@
   <% if @users.size == 0 then %>
     <li><em><%= t 'projects.index.no_users' %></em></li>
   <% else %>
-    <% @users.each_index do |i| user = @users[i].user %>
+
+    <% @users.each_with_index do |user_proj, i| %>
       <li>
         <% if i > 0 %><hr><% end %>
         <div class="row">
           <div class="col-xs-2">
-            <%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
+            <%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
           </div>
           <div class="col-xs-10">
-            <span><%= user.full_name %></span>
-            <br><span class="text-muted"><%= t('user_projects.enums.role.'<<@users[i].role.to_s) %></span>
+            <span><%= user_proj.user.full_name %></span>
+            <br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role.to_s) %></span>
           </div>
-        </div>
+        </div>  
       </li>
     <% end %>
   <% end %>
diff --git a/app/views/user_projects/_index_edit.html.erb b/app/views/user_projects/_index_edit.html.erb
index 199a6c410..ec5e69381 100644
--- a/app/views/user_projects/_index_edit.html.erb
+++ b/app/views/user_projects/_index_edit.html.erb
@@ -3,26 +3,26 @@
 <% if @users.size == 0 then %>
   <li><em><%= t 'projects.index.modal_manage_users.no_users' %></em></li>
 <% else %>
-  <% @users.each_index do |i| user = @users[i].user %>
+  <% @users.each_with_index do |user_proj, i| %>
   <li>
   <% if i > 0 %><hr><% end %>
     <div class="row">
 
       <div class="col-xs-2">
-        <%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
+        <%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
       </div>
 
       <div class="col-xs-10 col-sm-4">
-        <span><%= user.full_name %></span>
-        <br><span class="text-muted"><%= t('user_projects.enums.role.'<<@users[i].role) %></span>
+        <span><%= user_proj.user.full_name %></span>
+        <br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role) %></span>
       </div>
 
-      <% unless user.id == current_user.id %>
+      <% unless user_proj.user.id == current_user.id %>
       <div class="visible-xs">&nbsp;</div>
       <div class="col-xs-7 col-xs-offset-2 col-sm-4 col-sm-offset-0">
-        <%= form_for @up, url: project_user_project_path(@project, @users[i].id, method: :put, format: :json), format: :json, method: 'put', remote: true, html: { class: 'update-user-form' } do |f| %>
+        <%= form_for @up, url: project_user_project_path(@project, user_proj.id, method: :put, format: :json), format: :json, method: 'put', remote: true, html: { class: 'update-user-form' } do |f| %>
           <% # TODO replace with form helper %>
-          <input type="hidden" name="user_project[user_id]" value="<%= @users[i].id %>">
+          <input type="hidden" name="user_project[user_id]" value="<%= user_proj.id %>">
           <% # TODO replace hardcoded select html with rails helper %>
           <select class="selectpicker" name="user_project[role]">
             <option value=""><%= t('user_projects.edit.update_role') %></option>
@@ -34,7 +34,7 @@
         <% end %>
       </div>
       <div class="col-xs-3 col-sm-2">
-        <%= link_to project_user_project_path(@project, @users[i], format: :json), method: :delete, remote: true, class: 'btn btn-link remove-user-link' do %>
+        <%= link_to project_user_project_path(@project, user_proj, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-user-link' do %>
         <span class="glyphicon glyphicon-remove"></span>
         <% end %>
       </div>

From 2ab74c8979173a7cf1d4c21113bac5316f955e5e Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Thu, 29 Jun 2017 12:56:14 +0200
Subject: [PATCH 2/4] add user variable

---
 app/views/user_projects/_index.html.erb      | 7 +++----
 app/views/user_projects/_index_edit.html.erb | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/views/user_projects/_index.html.erb b/app/views/user_projects/_index.html.erb
index 57498aa97..be9a9f2b7 100644
--- a/app/views/user_projects/_index.html.erb
+++ b/app/views/user_projects/_index.html.erb
@@ -4,16 +4,15 @@
   <% if @users.size == 0 then %>
     <li><em><%= t 'projects.index.no_users' %></em></li>
   <% else %>
-
-    <% @users.each_with_index do |user_proj, i| %>
+    <% @users.each_with_index do |user_proj, i| user = user_proj.user %>
       <li>
         <% if i > 0 %><hr><% end %>
         <div class="row">
           <div class="col-xs-2">
-            <%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
+            <%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
           </div>
           <div class="col-xs-10">
-            <span><%= user_proj.user.full_name %></span>
+            <span><%= user.full_name %></span>
             <br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role.to_s) %></span>
           </div>
         </div>  
diff --git a/app/views/user_projects/_index_edit.html.erb b/app/views/user_projects/_index_edit.html.erb
index ec5e69381..0794c0545 100644
--- a/app/views/user_projects/_index_edit.html.erb
+++ b/app/views/user_projects/_index_edit.html.erb
@@ -3,21 +3,21 @@
 <% if @users.size == 0 then %>
   <li><em><%= t 'projects.index.modal_manage_users.no_users' %></em></li>
 <% else %>
-  <% @users.each_with_index do |user_proj, i| %>
+  <% @users.each_with_index do |user_proj, i| user = user_proj.user %>
   <li>
   <% if i > 0 %><hr><% end %>
     <div class="row">
 
       <div class="col-xs-2">
-        <%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
+        <%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
       </div>
 
       <div class="col-xs-10 col-sm-4">
-        <span><%= user_proj.user.full_name %></span>
+        <span><%= user.full_name %></span>
         <br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role) %></span>
       </div>
 
-      <% unless user_proj.user.id == current_user.id %>
+      <% unless user.id == current_user.id %>
       <div class="visible-xs">&nbsp;</div>
       <div class="col-xs-7 col-xs-offset-2 col-sm-4 col-sm-offset-0">
         <%= form_for @up, url: project_user_project_path(@project, user_proj.id, method: :put, format: :json), format: :json, method: 'put', remote: true, html: { class: 'update-user-form' } do |f| %>

From 4fb07e1e4ff370c74be39d334807a2e6f8ea8f6c Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Thu, 29 Jun 2017 13:33:59 +0200
Subject: [PATCH 3/4] fix edit comments

---
 app/views/project_comments/_comment.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/project_comments/_comment.html.erb b/app/views/project_comments/_comment.html.erb
index 54652df72..33a53f28f 100644
--- a/app/views/project_comments/_comment.html.erb
+++ b/app/views/project_comments/_comment.html.erb
@@ -18,6 +18,7 @@
           <li>
             <a href="#"
                data-action="edit-comment"
+               data-remote="true"
                data-url="<%= edit_project_project_comment_path(comment.project, comment, format: :json) %>">
               <%= t('comments.options_dropdown.edit') %>
             </a>

From a3514bdaf03e06d6b6e8a603baf71a52ed19d56c Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Thu, 29 Jun 2017 16:14:25 +0200
Subject: [PATCH 4/4] fix restore action from archives pages

---
 app/views/projects/archive.html.erb             | 2 +-
 app/views/projects/index.html.erb               | 2 +-
 app/views/shared/_secondary_navigation.html.erb | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/archive.html.erb b/app/views/projects/archive.html.erb
index 985808a77..6cac501d4 100644
--- a/app/views/projects/archive.html.erb
+++ b/app/views/projects/archive.html.erb
@@ -45,7 +45,7 @@
   </div>
   <div>
     <div class="col-xs-12">
-      <%= link_to t("projects.index.back_to_projects_index"), projects_path %>
+      <%= link_to t("projects.index.back_to_projects_index"), projects_path, data: { turbolinks: 'false' } %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 58e47d5fa..7ab6584cb 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -59,7 +59,7 @@
 
     <div class="form-group">
       <!-- project archive button -->
-      <a class="btn btn-default pull-right" href="<%= url_for projects_archive_path %>" id="project-archive-btn" title="">
+      <a class="btn btn-default pull-right" href="<%= url_for projects_archive_path %>" id="project-archive-btn" data-turbolinks="false" title="">
         <span class="glyphicon glyphicon-briefcase" aria-hidden="true"></span>
       </a>
 
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index 36b2006cc..90c300cb2 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -100,7 +100,7 @@
             </li>
           <% end %>
           <% if can_view_project_archive(@project) then %>
-            <li id="project-archive-nav-tab" class="<%= "active" if is_project_archive? %>">
+            <li id="project-archive-nav-tab" data-turbolinks="false" class="<%= "active" if is_project_archive? %>">
               <a href="<%= experiment_archive_project_url(@project) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
             </li>
           <% end %>
@@ -135,7 +135,7 @@
               </li>
           <% end %>
           <% if can_view_experiment_archive(@experiment) then %>
-              <li id="project-archive-nav-tab" class="<%= "active" if is_experiment_archive? %>">
+              <li id="project-archive-nav-tab" data-turbolinks="false" class="<%= "active" if is_experiment_archive? %>">
                 <a href="<%= module_archive_experiment_url(@experiment) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
               </li>
           <% end %>
@@ -211,7 +211,7 @@
             </li>
           <% end %>
           <% if can_view_module_archive(@my_module) then %>
-            <li id="archive-nav-tab" class="<%= "active" if is_module_archive? %>">
+            <li id="archive-nav-tab" data-turbolinks="false" class="<%= "active" if is_module_archive? %>">
               <a href="<%= archive_my_module_url(@my_module) %>">
                 <span class="glyphicon glyphicon-briefcase" title="<%= t'nav2.modules.archive' %>"></span></a>
             </li>