From b2b519ba9fe390ba6437fe1576b897409a934844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= Date: Mon, 27 May 2024 17:02:08 +0200 Subject: [PATCH] fix --- app/models/communication/website/with_git_repository.rb | 2 +- app/models/concerns/as_indirect_object.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/communication/website/with_git_repository.rb b/app/models/communication/website/with_git_repository.rb index 96dec5103..a9e137156 100644 --- a/app/models/communication/website/with_git_repository.rb +++ b/app/models/communication/website/with_git_repository.rb @@ -35,7 +35,7 @@ def repository_url # Synchronisation optimale d'objet indirect def sync_indirect_object_with_git(indirect_object) - indirect_object.direct_sources_with_dependencies.each do |dependency| + indirect_object.direct_sources_with_dependencies_for_website(self).each do |dependency| Communication::Website::GitFile.sync self, dependency end git_repository.sync! diff --git a/app/models/concerns/as_indirect_object.rb b/app/models/concerns/as_indirect_object.rb index 515eeb812..b08b5f5ed 100644 --- a/app/models/concerns/as_indirect_object.rb +++ b/app/models/concerns/as_indirect_object.rb @@ -52,10 +52,10 @@ def direct_sources_from_existing_connections connections.collect &:direct_source end - def direct_sources_with_dependencies + def direct_sources_with_dependencies_for_website(website) dependencies = [] direct_sources.each do |direct_source| - dependencies = add_direct_source_to_dependencies(direct_source, array: dependencies) + dependencies = add_direct_source_to_dependencies(direct_source, website, array: dependencies) end dependencies end @@ -78,9 +78,9 @@ def connect_and_sync_direct_sources end end - def add_direct_source_to_dependencies(direct_source, array: []) + def add_direct_source_to_dependencies(direct_source, website, array: []) # Ne pas traiter les sources d'autres sites - return array unless direct_source.website.id == self.id + return array unless direct_source.website.id == website.id # Ne pas traiter les sources non synchronisables return array unless direct_source.syncable? # Ne pas traiter si la source directe est déjà dans le tableau de dépendances