diff --git a/app/controllers/concerns/cookies_concern.rb b/app/controllers/concerns/cookies_concern.rb index b4c467cb2a..333e701188 100644 --- a/app/controllers/concerns/cookies_concern.rb +++ b/app/controllers/concerns/cookies_concern.rb @@ -45,13 +45,12 @@ def set_analytics_cookies(accept_analytics_cookies) cookies[:accept_analytics_cookies] = { value: accept_analytics_cookies, expires: 1.year.from_now } cookies[:cookie_preferences_set] = { value: accept_analytics_cookies, expires: 1.year.from_now } - if accept_analytics_cookies == true - cookies[:cookies_policy] = { - value: get_policy.to_json, - expires: 1.year.from_now, - httponly: true - } - end + cookies[:cookies_policy] = { + value: get_policy.to_json, + expires: 1.year.from_now, + httponly: true, + raw: true + } end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a1565a6c6f..8b3bd2b5b9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,12 +14,12 @@ <%= javascript_include_tag "application", type: "module", nonce: true %> <%= stylesheet_link_tag "application" %> <%= csrf_meta_tags %> - <% if Rails.env.production? && analytics_cookies_accepted? %> + <% unless Rails.env.development? %> <%= render "shared/ga_head" %> <% end %> - <% if Rails.env.production? && analytics_cookies_accepted? %> + <% unless Rails.env.development? %> <%= render "shared/ga_body" %> <% end %> <%= javascript_tag nonce: true do -%>