From 59c594d7b2d46f84676cad9ba90aa6c6a9f5ab8c Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 10 Jan 2022 16:56:12 +0100
Subject: [PATCH] add persons
---
app/models/communication/website/with_abouts.rb | 1 +
app/models/education/program.rb | 1 +
app/models/research/journal.rb | 2 +-
app/models/research/journal/article.rb | 2 +-
app/models/research/journal/volume.rb | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/models/communication/website/with_abouts.rb b/app/models/communication/website/with_abouts.rb
index 7606add7a..b818d4730 100644
--- a/app/models/communication/website/with_abouts.rb
+++ b/app/models/communication/website/with_abouts.rb
@@ -45,6 +45,7 @@ module Communication::Website::WithAbouts
posts.collect(&:author).map(&:author) +
programs.collect(&:university_people_through_teachers).flatten +
programs.collect(&:university_people_through_teachers).flatten.map(&:teacher)
+ # TODO amdinistrative via roles
# TODO researchers via articles
).uniq.compact
end
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index 77583d9d7..1116c3e01 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -126,6 +126,7 @@ class Education::Program < ApplicationRecord
university_people_through_teachers +
university_people_through_teachers.map(&:teacher) +
university_people_through_roles
+ # TODO: les administrative via roles
end
def git_destroy_dependencies(website)
diff --git a/app/models/research/journal.rb b/app/models/research/journal.rb
index b19a29a6a..cf2125d2e 100644
--- a/app/models/research/journal.rb
+++ b/app/models/research/journal.rb
@@ -40,7 +40,7 @@ class Research::Journal < ApplicationRecord
end
def git_dependencies(website)
- [self] + articles + volumes + researchers
+ [self] + articles + volumes + researchers + researchers.map(&:researcher)
end
def git_destroy_dependencies(website)
diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb
index ab701cc02..57373a9bb 100644
--- a/app/models/research/journal/article.rb
+++ b/app/models/research/journal/article.rb
@@ -60,7 +60,7 @@ class Research::Journal::Article < ApplicationRecord
end
def git_dependencies(website)
- [self] + researchers
+ [self] + researchers + researchers.map(&:researcher)
end
def to_s
diff --git a/app/models/research/journal/volume.rb b/app/models/research/journal/volume.rb
index a3b7dec6a..f8280422f 100644
--- a/app/models/research/journal/volume.rb
+++ b/app/models/research/journal/volume.rb
@@ -48,7 +48,7 @@ class Research::Journal::Volume < ApplicationRecord
end
def git_dependencies(website)
- [self] + articles + researchers + active_storage_blobs
+ [self] + articles + researchers + researchers.map(&:researcher) + active_storage_blobs
end
def git_destroy_dependencies(website)
--
GitLab