From 244cac6d1696c415d4f05625c4ab4d4a425a5ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 29 Dec 2022 16:26:35 +0100
Subject: [PATCH] website blocks dependencies for in_block_dependencies
---
app/models/concerns/with_git.rb | 4 +---
app/models/university/person.rb | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/models/concerns/with_git.rb b/app/models/concerns/with_git.rb
index 852b5de24..6fec8601b 100644
--- a/app/models/concerns/with_git.rb
+++ b/app/models/concerns/with_git.rb
@@ -89,9 +89,7 @@ module WithGit
protected
def in_block_dependencies?(website)
- website.blocks.find_each do |block|
- return true if in? block.git_dependencies
- end
+ website.blocks_dependencies.include?(self)
end
def dependencies_through_blocks(website)
diff --git a/app/models/university/person.rb b/app/models/university/person.rb
index 39479bef3..f36d3235e 100644
--- a/app/models/university/person.rb
+++ b/app/models/university/person.rb
@@ -208,11 +208,11 @@ class University::Person < ApplicationRecord
end
def for_website?(website)
- in_block_dependencies?(website) ||
administrator.for_website?(website) ||
author.for_website?(website) ||
researcher.for_website?(website) ||
- teacher.for_website?(website)
+ teacher.for_website?(website) ||
+ in_block_dependencies?(website)
end
def full_street_address
--
GitLab