fix merge issues

app/models/experiment.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 class Experiment < ApplicationRecord
-  SEARCHABLE_ATTRIBUTES = [:name, :description, "('EX' || id)"].freeze
+  EXPERIMENT_CODE_SQL = "('EX' || id)".freeze
+  SEARCHABLE_ATTRIBUTES = [:name, :description, EXPERIMENT_CODE_SQL].freeze
 
   include ArchivableModel
   include SearchableModel

app/views/projects/show/_experiment_actions_dropdown.html.erb

@@ -72,10 +72,12 @@
           <% end %>
         </li>
       <% else %>
-        <%= link_to access_permissions_project_experiment_path(project, experiment), data: { action: 'remote-modal'} do %>
-          <i class="fas fa-door-open"></i>
-          <span><%= t('experiments.index.experiment_access') %></span>
-        <% end %>
+        <li class="form-dropdown-item">
+          <%= link_to access_permissions_project_experiment_path(project, experiment), data: { action: 'remote-modal'} do %>
+            <i class="fas fa-door-open"></i>
+            <span><%= t('experiments.index.experiment_access') %></span>
+          <% end %>
+        </li>
       <% end %>
       <li class="form-dropdown-break">
         <hr>

app/views/projects/show/_experiment_card.html.erb

@@ -30,7 +30,7 @@
   </div>
   <div class="actions actions-cell table-cell">
     <% if can_manage_experiment?(experiment) %>
-      <%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment } %>
+      <%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment, project: project } %>
     <% end %>
   </div>
   <div class="dates-and-img-container">