mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-11-01 17:17:04 +08:00
Merge pull request #2643 from mlorb/ml-sci-4684
Add archive to repository [SCI-4684]
This commit is contained in:
commit
a29a8d67f4
4 changed files with 43 additions and 2 deletions
|
|
@ -9,6 +9,7 @@ class RepositoryBase < ApplicationRecord
|
|||
|
||||
belongs_to :team
|
||||
belongs_to :created_by, foreign_key: :created_by_id, class_name: 'User'
|
||||
belongs_to :archived_by, foreign_key: :archived_by_id, class_name: 'User', inverse_of: :repository, optional: true
|
||||
has_many :repository_columns, foreign_key: :repository_id, inverse_of: :repository, dependent: :destroy
|
||||
has_many :repository_rows, foreign_key: :repository_id, inverse_of: :repository, dependent: :destroy
|
||||
has_many :repository_table_states, foreign_key: :repository_id, inverse_of: :repository, dependent: :destroy
|
||||
|
|
@ -17,10 +18,17 @@ class RepositoryBase < ApplicationRecord
|
|||
auto_strip_attributes :name, nullify: false
|
||||
validates :team, presence: true
|
||||
validates :created_by, presence: true
|
||||
with_options if: :archived do
|
||||
validates :archived_by, presence: true
|
||||
validates :archived_on, presence: true
|
||||
end
|
||||
|
||||
# Not discarded
|
||||
default_scope -> { kept }
|
||||
|
||||
scope :active, -> { where(archived: false) }
|
||||
scope :archived, -> { where(archived: true) }
|
||||
|
||||
def cell_preload_includes
|
||||
cell_includes = []
|
||||
repository_columns.pluck(:data_type).each do |data_type|
|
||||
|
|
|
|||
|
|
@ -197,6 +197,9 @@ class User < ApplicationRecord
|
|||
class_name: 'Protocol',
|
||||
foreign_key: 'restored_by_id',
|
||||
inverse_of: :restored_by
|
||||
has_many :archived_repositories,
|
||||
class_name: 'RepositoryBase',
|
||||
foreign_key: 'archived_by_id'
|
||||
has_many :assigned_my_module_repository_rows,
|
||||
class_name: 'MyModuleRepositoryRow',
|
||||
foreign_key: 'assigned_by_id'
|
||||
|
|
|
|||
11
db/migrate/20200603125407_add_archive_to_repository.rb
Normal file
11
db/migrate/20200603125407_add_archive_to_repository.rb
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class AddArchiveToRepository < ActiveRecord::Migration[6.0]
|
||||
def change
|
||||
change_table :repositories, bulk: true do |t|
|
||||
t.boolean :archived, default: false, null: false
|
||||
t.datetime :archived_on
|
||||
t.references :archived_by, index: true, foreign_key: { to_table: :users }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1104,7 +1104,10 @@ CREATE TABLE public.repositories (
|
|||
parent_id bigint,
|
||||
status integer,
|
||||
selected boolean,
|
||||
my_module_id bigint
|
||||
my_module_id bigint,
|
||||
archived boolean DEFAULT false NOT NULL,
|
||||
archived_on timestamp without time zone,
|
||||
archived_by_id bigint
|
||||
);
|
||||
|
||||
|
||||
|
|
@ -4764,6 +4767,13 @@ CREATE INDEX index_reports_on_team_id ON public.reports USING btree (team_id);
|
|||
CREATE INDEX index_reports_on_user_id ON public.reports USING btree (user_id);
|
||||
|
||||
|
||||
--
|
||||
-- Name: index_repositories_on_archived_by_id; Type: INDEX; Schema: public; Owner: -
|
||||
--
|
||||
|
||||
CREATE INDEX index_repositories_on_archived_by_id ON public.repositories USING btree (archived_by_id);
|
||||
|
||||
|
||||
--
|
||||
-- Name: index_repositories_on_discarded_at; Type: INDEX; Schema: public; Owner: -
|
||||
--
|
||||
|
|
@ -5829,6 +5839,14 @@ ALTER TABLE ONLY public.steps
|
|||
ADD CONSTRAINT fk_rails_0f28e70afa FOREIGN KEY (user_id) REFERENCES public.users(id);
|
||||
|
||||
|
||||
--
|
||||
-- Name: repositories fk_rails_111f913cb7; Type: FK CONSTRAINT; Schema: public; Owner: -
|
||||
--
|
||||
|
||||
ALTER TABLE ONLY public.repositories
|
||||
ADD CONSTRAINT fk_rails_111f913cb7 FOREIGN KEY (archived_by_id) REFERENCES public.users(id);
|
||||
|
||||
|
||||
--
|
||||
-- Name: tables fk_rails_147b6eced4; Type: FK CONSTRAINT; Schema: public; Owner: -
|
||||
--
|
||||
|
|
@ -7194,6 +7212,7 @@ INSERT INTO "schema_migrations" (version) VALUES
|
|||
('20200113143828'),
|
||||
('20200204100934'),
|
||||
('20200326114643'),
|
||||
('20200331183640');
|
||||
('20200331183640'),
|
||||
('20200603125407');
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue