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

Merge pull request #3361 from okriuchykhin/ok_SCI_5755

Browse source 
Disable edit button for reports of archived projects [SCI-5755]
This commit is contained in:
Alex Kriuchykhin 2021-05-31 11:53:47 +02:00 • committed by GitHub
commit 0010fc83a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/reports/reports_datatable.js
View file

@ -132,6 +132,9 @@
.attr('data-retry-count', 0)
.attr('data-save-to-inventory-path', data.save_to_inventory)
.attr('data-id', data['0']);
if (data.archived) {
$(row).addClass('archived');
}
if (data['3'].processing || data['4'].processing) {
$(row).addClass('processing');
}
@ -161,6 +164,7 @@
$('.single-object-action, .multiple-object-action').removeClass('disabled hidden');
let $row = $(`.report-row[data-id=${CHECKED_REPORTS[0]}]`);
let archived = $row.hasClass('archived');
let pdfProcessing = $row.has('.processing.pdf').length > 0;
let docxProcessing = $row.has('.processing.docx').length > 0;
let docxGenerate = $row.has('.generate-docx').length > 0;
@ -185,12 +189,11 @@
}
}
if (pdfProcessing || docxProcessing) {
if (archived || pdfProcessing || docxProcessing) {
$('#edit-report-btn').addClass('disabled');
} else {
$('#edit-report-btn').removeClass('disabled');
}
} else {
$('.single-object-action').removeClass('hidden').addClass('disabled');
$('.multiple-object-action').removeClass('disabled hidden');

1
app/datatables/report_datatable.rb
View file

@ -60,6 +60,7 @@ class ReportDatatable < CustomDatatable
'6' => sanitize_input(record.modified_by),
'7' => I18n.l(record.created_at, format: :full),
'8' => I18n.l(record.updated_at, format: :full),
'archived' => record.project.archived?,
'edit' => edit_project_report_path(record.project_id, record.id),
'status' => status_project_report_path(record.project_id, record.id),
'generate_pdf' => generate_pdf_project_report_path(record.project_id, record.id),