From 682735db19ca1355a950a55104e469e1055fd772 Mon Sep 17 00:00:00 2001 From: jazzari Date: Wed, 10 Jan 2024 15:51:28 -0300 Subject: [PATCH 1/3] fix: corregido espacio extra en linea 102 #13077 --- app/services/site_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/site_service.rb b/app/services/site_service.rb index 7e1bef6b..6f2bd96b 100644 --- a/app/services/site_service.rb +++ b/app/services/site_service.rb @@ -97,9 +97,9 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do FileUtils.mv (site.path_was, site.path) moved = true ActiveStorage::Blob.where(service_name: site.name_was).update_all(service_name: site.name) - site.save + site.save rescue StandardError - FileUtils.mv (site.path, site.path_was) if moved + FileUtils.mv(site.path, site.path_was) if moved raise end end From 5133eb102234b4f5fb323b39a20f7173dc9cfc4f Mon Sep 17 00:00:00 2001 From: f Date: Tue, 26 Mar 2024 12:43:58 -0300 Subject: [PATCH 2/3] fix: error de sintaxis --- app/services/site_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/site_service.rb b/app/services/site_service.rb index 934a73f4..d148185a 100644 --- a/app/services/site_service.rb +++ b/app/services/site_service.rb @@ -95,7 +95,7 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do Site.transaction do raise ActiveRecord::Rollback if File.exists?(site.path) - FileUtils.mv (site.path_was, site.path) + FileUtils.mv(site.path_was, site.path) moved = true ActiveStorage::Blob.where(service_name: site.name_was).update_all(service_name: site.name) site.save From ad7f55adf73a1fb0c27ed8473d982e7c0e2d3fba Mon Sep 17 00:00:00 2001 From: f Date: Tue, 26 Mar 2024 12:44:07 -0300 Subject: [PATCH 3/3] chore: rubocop --- app/services/site_service.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/site_service.rb b/app/services/site_service.rb index d148185a..8c0a6833 100644 --- a/app/services/site_service.rb +++ b/app/services/site_service.rb @@ -89,19 +89,21 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do end def rename(name) - return if name == site.name + return if name == site.name + moved = false - site.name = name + site.name = name Site.transaction do - raise ActiveRecord::Rollback if File.exists?(site.path) + raise ActiveRecord::Rollback if File.exist?(site.path) + FileUtils.mv(site.path_was, site.path) moved = true ActiveStorage::Blob.where(service_name: site.name_was).update_all(service_name: site.name) site.save - rescue StandardError - FileUtils.mv(site.path, site.path_was) if moved - raise + rescue StandardError + FileUtils.mv(site.path, site.path_was) if moved + raise end end @@ -239,9 +241,7 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do end end - private - - def with_all_locales(&block) + def with_all_locales site.locales.map do |locale| next unless I18n.available_locales.include? locale