Merge pull request #1050 from brian-kephart/master

Fix the test email for non-main sites
owen2345 · May 19, 2023 · 034fa94 · 034fa94
2 parents b83efee + ec95cb2
commit 034fa94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/camaleon_cms/admin/settings_controller.rb b/app/controllers/camaleon_cms/admin/settings_controller.rb
@@ -70,7 +70,8 @@ def save_theme
 
       # send email test
       def test_email
-        CamaleonCms::HtmlMailer.sender(params[:email], 'Test', { content: 'Test content' }).deliver_now
+        data = { content: 'Test content', current_site: current_site, url_base: cama_root_url }
+        CamaleonCms::HtmlMailer.sender(params[:email], 'Test', data).deliver_now
         head :ok
       rescue StandardError => e
         render inline: e.message, status: 502

diff --git a/app/mailers/camaleon_cms/html_mailer.rb b/app/mailers/camaleon_cms/html_mailer.rb
@@ -58,8 +58,11 @@ def sender(email, subject = 'Hello', data = {})
       prepend_view_path(Rails.root.join(views_dir).to_s)
 
       theme = @current_site.get_theme
-      lookup_context.prefixes.prepend("themes/#{theme.slug}") if theme.settings['gem_mode']
-      lookup_context.prefixes.prepend("themes/#{theme.slug}/views") unless theme.settings['gem_mode']
+      if theme.settings && theme.settings['gem_mode']
+        lookup_context.prefixes.prepend("themes/#{theme.slug}")
+      else
+        lookup_context.prefixes.prepend("themes/#{theme.slug}/views")
+      end
       lookup_context.use_camaleon_partial_prefixes = true
       ((data[:files] || []) + (data[:attachments] || [])).each do |attach|
         if File.exist?(attach) && !File.directory?(attach)