scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 01:35:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2

Browse source 
Unify tags loading order [SCI-6943]
This commit is contained in:
Alex Kriuchykhin 2022-10-17 10:21:13 +02:00 committed by GitHub
commit 63a1b35a45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/my_module_tags_controller.rb
View file

@ -7,7 +7,7 @@ class MyModuleTagsController < ApplicationController
def index_edit def index_edit
@my_module_tags = @my_module.my_module_tags.order(:id) @my_module_tags = @my_module.my_module_tags.order(:id)
@unassigned_tags = @my_module.unassigned_tags @unassigned_tags = @my_module.unassigned_tags.order(:id)
@new_mmt = MyModuleTag.new(my_module: @my_module) @new_mmt = MyModuleTag.new(my_module: @my_module)
@new_tag = Tag.new(project: @my_module.experiment.project) @new_tag = Tag.new(project: @my_module.experiment.project)

7
app/models/my_module.rb
View file

@ -188,12 +188,7 @@ class MyModule < ApplicationRecord
end end
def unassigned_tags def unassigned_tags
Tag.find_by_sql( experiment.project.tags.where.not(id: tags)
"SELECT DISTINCT tags.id, tags.name, tags.color FROM tags " +
"INNER JOIN experiments ON experiments.project_id = tags.project_id " +
"WHERE experiments.id = #{experiment_id.to_s} AND tags.id NOT IN " +
"(SELECT DISTINCT tag_id FROM my_module_tags WHERE my_module_tags.my_module_id = #{id.to_s})"
)
end end
def last_activities(count = Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT) def last_activities(count = Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT)

6
app/services/reports/docx/draw_my_module.rb
View file

@ -6,7 +6,7 @@ module Reports::Docx::DrawMyModule
link_style = @link_style link_style = @link_style
scinote_url = @scinote_url scinote_url = @scinote_url
my_module = subject.my_module my_module = subject.my_module
tags = my_module.tags tags = my_module.tags.order(:id)
return unless can_read_my_module?(@user, my_module) return unless can_read_my_module?(@user, my_module)
@docx.h3 do @docx.h3 do
@ -48,10 +48,10 @@ module Reports::Docx::DrawMyModule
end end
end end
if tags.any? if tags.present?
@docx.p do @docx.p do
text I18n.t('projects.reports.elements.module.tags_header') text I18n.t('projects.reports.elements.module.tags_header')
my_module.tags.each do |tag| tags.each do |tag|
text ' ' text ' '
text "[#{tag.name}]", color: tag.color.delete('#') text "[#{tag.name}]", color: tag.color.delete('#')
end end

2
app/views/canvas/_tags.html.erb
View file

@ -1,5 +1,5 @@
<div class="tags-container pull-right"> <div class="tags-container pull-right">
<% tags2 = my_module.tags[0..3] %> <% tags2 = my_module.tags.order(:id).take(4) %>
<% tags2.each do |tag| %> <% tags2.each do |tag| %>
<div style="color: <%= tag.color %>" <div style="color: <%= tag.color %>"
class="<%= "last" if tag == tags2[-1] %>" class="<%= "last" if tag == tags2[-1] %>"

4
app/views/reports/elements/_my_module_element.html.erb
View file

@ -39,8 +39,8 @@
<div class="pull-left"> <div class="pull-left">
<%= t('projects.reports.elements.module.tags_header') %> <%= t('projects.reports.elements.module.tags_header') %>
</div> </div>
<% if my_module.tags.present? %> <% if (tags = my_module.tags.order(:id)).present? %>
<% my_module.tags.each do |tag| %> <% tags.each do |tag| %>
<div class="pull-left module-tag" style="background-color: <%= tag.color %>;"> <div class="pull-left module-tag" style="background-color: <%= tag.color %>;">
<%= tag.name %> <%= tag.name %>
</div> </div>