scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 03:46:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix folders breadcrumbs [SCI-5597]

Browse source
This commit is contained in:
aignatov-bio 2021-03-26 11:58:18 +01:00
parent e9c1c27087
commit 1c93131ff1
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View file

@ -46,7 +46,7 @@ class ProjectsController < ApplicationController
else else
if current_folder if current_folder
breadcrumbs_html = render_to_string(partial: 'projects/index/breadcrumbs.html.erb', breadcrumbs_html = render_to_string(partial: 'projects/index/breadcrumbs.html.erb',
locals: { target_folder: current_folder }) locals: { target_folder: current_folder, folder_page: true })
projects_cards_url = project_folder_cards_url(current_folder) projects_cards_url = project_folder_cards_url(current_folder)
title = current_folder.name title = current_folder.name
else else

4
app/views/projects/index/_breadcrumbs.html.erb
View file

@ -1,8 +1,10 @@
<% target_folder ||= nil %> <% target_folder ||= nil %>
<% experiment ||= nil %> <% experiment ||= nil %>
<% project ||= nil %> <% project ||= nil %>
<% folder_page ||= false %>
<% links = [] %> <% links = [] %>
<% folders = tree_ordered_parent_folders(target_folder) %> <% folders = tree_ordered_parent_folders(target_folder) %>
<% folders = folders&.take(folders.size - 1) if folder_page %>
<div class="projects-breadcrumbs breadcrumbs-container"> <div class="projects-breadcrumbs breadcrumbs-container">
<% <%
@ -13,7 +15,7 @@
data: { projects_cards_url: cards_projects_url, sidebar_url: sidebar_team_path(current_team) } data: { projects_cards_url: cards_projects_url, sidebar_url: sidebar_team_path(current_team) }
}) })
folders&.take(folders.size - 1)&.each do |project_folder| folders&.each do |project_folder|
links.push({ links.push({
label: project_folder.name, label: project_folder.name,
url: project_folder_path(project_folder), url: project_folder_path(project_folder),

2
app/views/projects/index/_header.html.erb
View file

@ -1,6 +1,6 @@
<div class="content-header sticky-header"> <div class="content-header sticky-header">
<div id="breadcrumbsWrapper"> <div id="breadcrumbsWrapper">
<%= render partial: 'projects/index/breadcrumbs', locals: { target_folder: current_folder } if current_folder %> <%= render partial: 'projects/index/breadcrumbs', locals: { target_folder: current_folder, folder_page: true } if current_folder %>
</div> </div>
<div class="title-row"> <div class="title-row">
<h1 data-view-mode="active" class="projects-title name-readonly-placeholder"><%= current_folder&.name || t('projects.index.head_title') %></h1> <h1 data-view-mode="active" class="projects-title name-readonly-placeholder"><%= current_folder&.name || t('projects.index.head_title') %></h1>