From df3b7710480b528346c069787935392453253383 Mon Sep 17 00:00:00 2001 From: Pet Date: Tue, 15 May 2018 20:59:29 +0200 Subject: [PATCH] Added the verleihkalender view --- app/controllers/home_controller.rb | 7 +++++++ app/views/home/verleihkalender.html.erb | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1c6ab33..3475e8c 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,4 +1,5 @@ class HomeController < ApplicationController + after_action :allow_iframe, only: :verleihkalender def index @beispiele = Beispiel.last([Beispiel.count, 3].min) @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10) @@ -121,5 +122,11 @@ class HomeController < ApplicationController File.open("config/contact_topic.yml",'w'){|f| f.write(t.to_yaml)} redirect_to admin_home_index_path end + + private + + def allow_iframe + response.headers.except! 'X-Frame-Options' + end end diff --git a/app/views/home/verleihkalender.html.erb b/app/views/home/verleihkalender.html.erb index d4297ca..b1de604 100644 --- a/app/views/home/verleihkalender.html.erb +++ b/app/views/home/verleihkalender.html.erb @@ -10,9 +10,7 @@ - - <%= content_tag(:iframe,'', width: "100%", height: "100%", name: "targetframe", allowTransparency:"true", scrolling:"no", frameborder:"0", src: "/iframe/infoscreenframe.html") %> <%#header picture/animation %> -