scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7818 from artoscinote/ma_SCI_11005

Browse source 
Fix project export permission checks [SCI-11005]
This commit is contained in:
Martin Artnik 2024-08-27 14:32:48 +02:00 committed by GitHub
parent bcd124df51 e4e547aa6d
commit 6260ca7a7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/jobs/team_zip_export_job.rb
View file

@ -52,13 +52,13 @@ class TeamZipExportJob < ZipExportJob
# Include all experiments
ex_idx = ex_archive_idx = 0
project.experiments.find_each do |experiment|
project.experiments.readable_by_user(@user).find_each do |experiment|
idx = experiment.archived ? (ex_archive_idx += 1) : (ex_idx += 1)
experiment_path = make_model_dir(project_path, experiment, idx)
# Include all modules
mod_pos = mod_archive_pos = 0
experiment.my_modules.order(:workflow_order).find_each do |my_module|
experiment.my_modules.readable_by_user(@user).order(:workflow_order).find_each do |my_module|
pos = my_module.archived ? (mod_archive_pos += 1) : (mod_pos += 1)
my_module_path = make_model_dir(experiment_path, my_module, pos)

4
app/models/repository_snapshot.rb
View file

@ -37,6 +37,10 @@ class RepositorySnapshot < RepositoryBase
.where(my_module: { experiments: { project: project } })
}
scope :readable_by_user, lambda { |user|
where(my_module_id: MyModule.readable_by_user(user).select(:id))
}
def self.create_preliminary!(repository, my_module, created_by = nil)
created_by ||= repository.created_by
create!(