scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-26 16:53:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix tags modal in table view for archived tasks [SCI-7743] (#4867)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-01-20 10:21:52 +01:00 committed by GitHub
parent 9050785bb1
commit 5238a858bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/experiments/table.js
View file

@ -665,12 +665,12 @@ ExperimnetTable.render.assigned = function(data) {
};
ExperimnetTable.render.tags = function(data) {
let value;
if (!data.can_create) {
value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.not_set') : data.tags;
return `<span class="disabled">${value}</span>`;
const value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.add_tag') : data.tags;
if (data.tags === 0 && !data.can_create) {
return `<span class="disabled">${I18n.t('experiments.table.not_set')}</span>`;
}
value = parseInt(data.tags, 10) === 0 ? I18n.t('experiments.table.add_tag') : data.tags;
return `<a href="${data.edit_url}"
id="myModuleTags${data.my_module_id}"
data-remote="true"

8
app/assets/stylesheets/experiment/show.scss
View file

@ -8,6 +8,14 @@
}
}
#experimentTable {
&.archived {
[data-view-mode="active"] {
display: none !important;
}
}
}
#experiment-canvas {
[data-view-mode="archived"] {
display: none;

2
app/views/experiments/table.html.erb
View file

@ -31,6 +31,7 @@
</div>
<%= render partial: 'experiments/no_task_results.html.erb' %>
</div>
<%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %>
</div>
<template id="experimentTablePlaceholder">
@ -55,7 +56,6 @@
</div>
</template>
<%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %>
<%= render partial: "canvas/edit/modal/edit_module" %>
<%= render partial: "experiments/table_display_modal"%>