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

Merge pull request #5187 from artoscinote/ma_SCI_8182

Browse source 
Fix issues with protocol assignments and published attributes [SCI-8182]
This commit is contained in:
Alex Kriuchykhin 2023-03-24 11:05:12 +01:00 committed by GitHub
commit 5016034189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/settings/user_teams_controller.rb
View file

@ -197,7 +197,11 @@ module Users
protocol.restored_by = new_owner if protocol.restored_by == user_assignment.user protocol.restored_by = new_owner if protocol.restored_by == user_assignment.user
protocol.save!(validate: false) protocol.save!(validate: false)
protocol.user_assignments.find_by(user: new_owner)&.destroy! protocol.user_assignments.find_by(user: new_owner)&.destroy!
protocol.user_assignments.create!(user: new_owner, user_role: UserRole.find_predefined_owner_role) protocol.user_assignments.create!(
user: new_owner,
user_role: UserRole.find_predefined_owner_role,
assigned: :manually
)
end end
# Make new owner author of all inventory items that were added # Make new owner author of all inventory items that were added

11
db/migrate/20221125133611_add_protocol_versioning.rb
View file

@ -14,7 +14,7 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
end end
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 6, "archived" = TRUE WHERE "protocols"."protocol_type" = 4;' 'UPDATE "protocols" SET "protocol_type" = 6, "archived" = TRUE, "published_on" = NULL WHERE "protocols"."protocol_type" = 4;'
) )
execute( execute(
'UPDATE "protocols" SET "visibility" = 1 WHERE "protocols"."protocol_type" = 3;' 'UPDATE "protocols" SET "visibility" = 1 WHERE "protocols"."protocol_type" = 3;'
@ -28,7 +28,7 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
');' ');'
) )
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 6 ' \ 'UPDATE "protocols" SET "protocol_type" = 6, "published_on" = NULL ' \
'WHERE "id" IN (' \ 'WHERE "id" IN (' \
'SELECT DISTINCT "protocols"."id" FROM "protocols" ' \ 'SELECT DISTINCT "protocols"."id" FROM "protocols" ' \
'LEFT OUTER JOIN "protocols" "linked_children" ON "linked_children"."parent_id" = "protocols"."id" ' \ 'LEFT OUTER JOIN "protocols" "linked_children" ON "linked_children"."parent_id" = "protocols"."id" ' \
@ -40,6 +40,13 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
'WHERE "protocols"."protocol_type" = 5 ' \ 'WHERE "protocols"."protocol_type" = 5 ' \
'AND "protocols"."published_on" IS NULL;' 'AND "protocols"."published_on" IS NULL;'
) )
execute(
'UPDATE "protocols" SET "published_by_id" = "added_by_id" ' \
'WHERE "protocols"."protocol_type" = 5 ' \
'AND "protocols"."visibility" = 1' \
'AND "protocols"."published_by_id" IS NULL;'
)
end end
def down def down

7
db/migrate/20230120141017_add_protocol_versioning_permissions.rb
View file

@ -23,6 +23,13 @@ class AddProtocolVersioningPermissions < ActiveRecord::Migration[6.1]
@normal_user_role.permissions = @normal_user_role.permissions - REMOVED_NORMAL_USER_PERMISSIONS @normal_user_role.permissions = @normal_user_role.permissions - REMOVED_NORMAL_USER_PERMISSIONS
@owner_role.save(validate: false) @owner_role.save(validate: false)
@normal_user_role.save(validate: false) @normal_user_role.save(validate: false)
# properly assign protocol owners, who must always be marked as assigned manually
UserAssignment.where(
assignable_type: 'Protocol',
user_role: UserRole.find_predefined_owner_role,
assigned: :automatically
).update_all(assigned: :manually)
end end
dir.down do dir.down do