From 4c2436b586b151210987befb96ef362615537b11 Mon Sep 17 00:00:00 2001 From: Adrian Hinz Date: Wed, 28 Jun 2017 10:31:15 +0200 Subject: [PATCH] Signed-off-by: Adrian Hinz --- app/controllers/application_controller.rb | 8 ++++++++ config/application.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9c1efd5..9b1f6f1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,11 +3,19 @@ class ApplicationController < ActionController::Base before_action :authenticate_user! before_action :set_locale layout :layout_by_resource + after_filter :set_headers def set_locale I18n.locale = params[:lang] || I18n.default_locale end + def set_headers + headers['Access-Control-Allow-Origin'] = 'lvh.me' + headers['Access-Control-Allow-Methods'] = 'POST, PUT, DELETE, GET, OPTIONS' + headers['Access-Control-Request-Method'] = '*' + headers['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept, Authorization' + end + protected def layout_by_resource diff --git a/config/application.rb b/config/application.rb index bf2db9c..7524ffc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,7 +13,7 @@ module InvoiceKeeper # -- all .rb files in that directory are automatically loaded. config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s] config.i18n.default_locale = :pl - config.action_dispatch.default_headers['X-Frame-Options'] = "ALLOW-FROM http://lvh.me" + config.action_dispatch.default_headers['X-Frame-Options'] = "ALLOW-FROM lvh.me" config.assets.paths << Rails.root.join('app', 'assets', 'fonts') config.assets.precompile += %w( .svg .eot .woff .ttf .otf .woff2 ) end