mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-04 20:25:22 +08:00
Merge branch 'develop' into features/team-automations
This commit is contained in:
commit
c1bcebceb2
4 changed files with 5 additions and 14 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
1.44.0
|
||||
1.44.0.2
|
||||
|
|
|
@ -52,7 +52,6 @@ class Repository < RepositoryBase
|
|||
scope :appendable_by_user, lambda { |user, teams = user.current_team|
|
||||
active.with_granted_permissions(user, RepositoryPermissions::ROWS_CREATE, teams)
|
||||
.where(type: Extends::REPOSITORY_APPENDABLE_TYPES)
|
||||
.where(team: teams)
|
||||
}
|
||||
|
||||
def self.permission_class
|
||||
|
|
|
@ -74,7 +74,7 @@ class MoveEveryOneElseAssignmentToTeamAssignments < ActiveRecord::Migration[7.2]
|
|||
end
|
||||
|
||||
# PET
|
||||
Project.visible.preload(:experiments).find_in_batches(batch_size: 100) do |projects|
|
||||
Project.visible.find_in_batches(batch_size: 10) do |projects|
|
||||
projects.each do |project|
|
||||
project_automatic_user_assignments = project.user_assignments.where(assigned: :automatically)
|
||||
next if project_automatic_user_assignments.blank?
|
||||
|
@ -82,8 +82,8 @@ class MoveEveryOneElseAssignmentToTeamAssignments < ActiveRecord::Migration[7.2]
|
|||
user_role = project_automatic_user_assignments.first.user_role
|
||||
team_assignment_values = []
|
||||
|
||||
project.experiments.preload(:my_modules).each do |experiment|
|
||||
experiment.my_modules.each do |my_module|
|
||||
Experiment.joins(:project).where(project: project).find_each do |experiment|
|
||||
MyModule.joins(:experiment).where(experiment: experiment).find_each do |my_module|
|
||||
team_assignment_values << new_team_assignment(project.team_id, my_module, user_role)
|
||||
my_module.automatic_user_assignments.where(user_id: project_automatic_user_assignments.select(:user_id)).delete_all
|
||||
end
|
||||
|
|
10
yarn.lock
10
yarn.lock
|
@ -4201,15 +4201,7 @@ setimmediate@^1.0.4:
|
|||
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
|
||||
integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
|
||||
|
||||
sha.js@^2.4.0, sha.js@^2.4.8:
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
|
||||
integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
|
||||
dependencies:
|
||||
inherits "^2.0.1"
|
||||
safe-buffer "^5.0.1"
|
||||
|
||||
sha.js@^2.4.11:
|
||||
sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
|
||||
version "2.4.12"
|
||||
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
|
||||
integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
|
||||
|
|
Loading…
Add table
Reference in a new issue