From 0c79df2f5d95aba157b516f4229ca405e7f402bb Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 24 Feb 2022 17:45:33 +0100
Subject: [PATCH] block dependencies
---
app/models/communication/website/page.rb | 10 ++++++++--
app/models/education/program.rb | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb
index 489f04ea4..7aa7eee02 100644
--- a/app/models/communication/website/page.rb
+++ b/app/models/communication/website/page.rb
@@ -78,11 +78,17 @@ class Communication::Website::Page < ApplicationRecord
end
def git_dependencies(website)
- [self] + descendents + active_storage_blobs + siblings + git_block_dependencies
+ [self] +
+ descendents +
+ active_storage_blobs +
+ siblings +
+ git_block_dependencies
end
def git_destroy_dependencies(website)
- [self] + descendents + active_storage_blobs
+ [self] +
+ descendents +
+ active_storage_blobs
end
def url
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index df8358182..5d9827e76 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -145,6 +145,7 @@ class Education::Program < ApplicationRecord
def git_dependencies(website)
[self] +
active_storage_blobs +
+ git_block_dependencies +
university_people_through_involvements +
university_people_through_involvements.map(&:active_storage_blobs).flatten +
university_people_through_involvements.map(&:teacher) +
--
GitLab