X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/821ebdd57b7e39e328fc95eedbb63ffc02c81983..ca719af262380a906103e7aec9befb4c903693a1:/app/controllers/application_controller.rb?ds=sidebyside diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d46a68215..32b53bad7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base def self.allow_thirdparty_images(**options) content_security_policy(options) do |policy| - policy.img_src("*") + policy.img_src("*", :data) end end @@ -279,7 +279,15 @@ class ApplicationController < ActionController::Base end end - helper_method :preferred_editor + def preferred_color_scheme(subject) + if current_user + current_user.preferences.find_by(:k => "#{subject}.color_scheme")&.v || "auto" + else + "auto" + end + end + + helper_method :preferred_editor, :preferred_color_scheme def update_totp if Settings.key?(:totp_key)