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

Small fixes for projects folder cards [SCI-5345] (#3049)

Browse source
This commit is contained in:
aignatov-bio 2021-01-07 17:02:25 +01:00 • committed by GitHub
parent 5aae35d700
commit 0d7da90b15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/projects.scss
View file

@ -849,6 +849,12 @@ li.module-hover {
color: $color-volcano;
width: 100%;
}
.project-folder-link {
color: $color-volcano;
display: contents;
text-decoration: none;
}
}
&.project-card {

8
app/services/projects_overview_service.rb
View file

@ -91,10 +91,14 @@ class ProjectsOverviewService
end
def fetch_project_folder_records
project_folders = @team.project_folders.preload(team: :user_teams).left_outer_joins(:projects, :project_folders)
project_folders = @team.project_folders
.preload(team: :user_teams)
.joins('LEFT OUTER JOIN project_folders child_folders
ON child_folders.parent_folder_id = project_folders.id')
.left_outer_joins(:projects)
project_folders.select('project_folders.*')
.select('COUNT(DISTINCT projects.id) AS projects_count')
.select('COUNT(DISTINCT project_folders.id) AS folders_count')
.select('COUNT(DISTINCT child_folders.id) AS folders_count')
.group('project_folders.id')
end

24
app/views/projects/index/_folder_card.html.erb
View file

@ -10,17 +10,19 @@
<span class="sci-checkbox-label"></span>
</div>
</div>
<div class="icon-folder">
<i class="fas fa-folder"></i>
</div>
<div class="name" title="<%= folder.name %>">
<%= link_to(folder.name,
project_folder_path(folder),
class: 'project-folder-link',
data: { projects_cards_url: project_folder_cards_url(folder),
sidebar_url: sidebar_team_path(current_team, project_folder_id: folder.id),
}) %>
</div>
<%= link_to project_folder_path(folder),
class: 'project-folder-link',
data: {
projects_cards_url: project_folder_cards_url(folder),
sidebar_url: sidebar_team_path(current_team, project_folder_id: folder.id)
} do %>
<div class="icon-folder">
<i class="fas fa-folder"></i>
</div>
<div class="name">
<%= folder.name %>
</div>
<% end %>
<div class="description">
<%= t('projects.index.folder.description', projects_count: folder.projects_count, folders_count: folder.folders_count) %>
</div>