scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab

Browse source 
Remove inventory tab from task and routes to inventory page [SCI-4632]
This commit is contained in:
aignatov-bio 2020-05-18 11:16:17 +02:00 committed by GitHub
parent 343356cab7 bac98bdbdc
commit acb1b392fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/sidebar_helper.rb
View file

@ -30,11 +30,6 @@ module SidebarHelper
samples_my_module_url(my_module)
elsif action_name.in?(%w(archive module_archive experiment_archive))
archive_my_module_url(my_module)
elsif action_name == 'repository' && @repository
repository_my_module_url(
id: my_module.id,
repository_id: @repository.id
)
else
protocols_my_module_url(my_module)
end

2
app/views/search/results/partials/_my_module_text.html.erb
View file

@ -15,7 +15,7 @@
<% if can_read_experiment?(my_module.experiment) %>
<% case link_to_page %>
<% when :repositories %>
<%= route_to_other_team repository_my_module_path(my_module, repository),
<%= route_to_other_team protocols_my_module_path(my_module),
my_module.experiment.project.team,
text %>
<% when :protocols %>

17
app/views/shared/_secondary_navigation.html.erb
View file

@ -117,21 +117,6 @@
<% end %>
<li data-hook="secondary-navigation-tabs"></li>
<% if can_read_team?(@my_module.experiment.project.team) &&
Repository.accessible_by_teams(current_team).exists? %>
<li id="repositories-nav-tab"
class="<%= "active" if module_repository_page? %> dropdown repositories-dropdown"
data-url="<%= module_repository_page? ? repositories_dropdown_repository_tab_my_module_path(repository: @repository) : repositories_dropdown_my_module_path %>">
<a href="#" id="repositoriesDropdownMenuLink" title="<%=t "nav2.modules.repositories" %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="hidden-sm hidden-md"><%=t "nav2.modules.repositories" %></span>
<span class="hidden-xs hidden-lg fas fa-list-alt"></span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu repositories-dropdown-menu" aria-labelledby="repositoriesDropdownMenuLink">
<%= render partial: "repositories_dropdown.html.erb", locals: { enable_counters: false } %>
</ul>
</li>
<% end %>
<% if can_read_experiment?(@my_module.experiment) then %>
<li id="archive-nav-tab" class="<%= "active" if is_module_archive? %>">
<a href="<%= archive_my_module_url(@my_module) %>" title="<%= t'nav2.modules.archive' %>">
@ -148,7 +133,7 @@
<h2 class="nav-name <%= @inline_editable_title_config.present? ? 'editable' : '' %>">
<% if @inline_editable_title_config.present? %>
<%= render partial: "shared/inline_editing",
locals: {
locals: {
initial_value: title_element.name,
config: @inline_editable_title_config
} %>

3
config/routes.rb
View file

@ -435,9 +435,6 @@ Rails.application.routes.draw do
get 'results' # Results view for single module
# get 'samples' # Samples view for single module
# Repository view for single module
get 'repository/:repository_id',
to: 'my_modules#repository',
as: :repository
post 'repository_index/:repository_id',
to: 'my_modules#repository_index',
as: :repository_index