scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-11 23:54:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-03-13 09:55:53 +01:00 • committed by GitHub
parent fcfe8d81cb
commit d285a0a9db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/protocol.rb
View file

@ -27,9 +27,12 @@ class Protocol < ApplicationRecord
enum protocol_type: { enum protocol_type: {
unlinked: 0, unlinked: 0,
linked: 1, linked: 1,
in_repository_published_original: 2, in_repository_private: 2, # Deprecated
in_repository_draft: 3, in_repository_public: 3, # Deprecated
in_repository_published_version: 4 in_repository_archived: 4, # Deprecated
in_repository_published_original: 5,
in_repository_draft: 6,
in_repository_published_version: 7
} }
auto_strip_attributes :name, :description, nullify: false auto_strip_attributes :name, :description, nullify: false

2
config/initializers/extends/permission_extends.rb
View file

@ -140,7 +140,7 @@ module PermissionExtends
TeamPermissions::LABEL_TEMPLATES_MANAGE, TeamPermissions::LABEL_TEMPLATES_MANAGE,
ProtocolPermissions::READ, ProtocolPermissions::READ,
ProtocolPermissions::READ_ARCHIVED, ProtocolPermissions::READ_ARCHIVED,
ProtocolPermissions::MANAGE, ProtocolPermissions::MANAGE_DRAFT,
ReportPermissions::READ, ReportPermissions::READ,
ReportPermissions::MANAGE, ReportPermissions::MANAGE,
ProjectPermissions::READ, ProjectPermissions::READ,

18
db/migrate/20221125133611_add_protocol_versioning.rb
View file

@ -14,13 +14,13 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
end end
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 3, "archived" = TRUE WHERE "protocols"."protocol_type" = 4;' 'UPDATE "protocols" SET "protocol_type" = 6, "archived" = TRUE 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;'
) )
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 2 ' \ 'UPDATE "protocols" SET "protocol_type" = 5 ' \
'WHERE "id" IN (' \ 'WHERE "id" IN (' \
'SELECT DISTINCT "protocols"."id" FROM "protocols" ' \ 'SELECT DISTINCT "protocols"."id" FROM "protocols" ' \
'JOIN "protocols" "linked_children" ON "linked_children"."parent_id" = "protocols"."id" ' \ 'JOIN "protocols" "linked_children" ON "linked_children"."parent_id" = "protocols"."id" ' \
@ -28,7 +28,7 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
');' ');'
) )
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 3 ' \ 'UPDATE "protocols" SET "protocol_type" = 6 ' \
'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" ' \
@ -37,16 +37,24 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1]
) )
execute( execute(
'UPDATE "protocols" SET "published_on" = "created_at", "published_by_id" = "added_by_id" ' \ 'UPDATE "protocols" SET "published_on" = "created_at", "published_by_id" = "added_by_id" ' \
'WHERE "protocols"."protocol_type" = 2 ' \ 'WHERE "protocols"."protocol_type" = 5 ' \
'AND "protocols"."published_on" IS NULL;' 'AND "protocols"."published_on" IS NULL;'
) )
end end
def down def down
execute( execute(
'UPDATE "protocols" SET "protocol_type" = 4 WHERE "protocols"."protocol_type" IN (2, 3, 4) AND ' \ 'UPDATE "protocols" SET "protocol_type" = 4 WHERE "protocols"."protocol_type" IN (5, 6, 7) AND ' \
'"protocols"."archived" = TRUE;' '"protocols"."archived" = TRUE;'
) )
execute(
'UPDATE "protocols" SET "protocol_type" = 3 WHERE "protocols"."protocol_type" IN (5, 6, 7) AND ' \
'"protocols"."visibility" = 1;'
)
execute(
'UPDATE "protocols" SET "protocol_type" = 2 WHERE "protocols"."protocol_type" IN (5, 6, 7) AND ' \
'"protocols"."visibility" != 1;'
)
change_table :protocols, bulk: true do |t| change_table :protocols, bulk: true do |t|
t.remove_references :published_by t.remove_references :published_by
t.remove_references :last_modified_by t.remove_references :last_modified_by