From 163d7b83b547e725c0cda92ffb9125844a8c1a28 Mon Sep 17 00:00:00 2001 From: Francisco Marcelo de Araújo Lima Júnior Date: Thu, 13 Mar 2014 16:40:26 -0300 Subject: [PATCH] change default return value --- app/controllers/embed_controller.rb | 2 +- app/models/block.rb | 2 +- app/views/shared/embed_denied.rhtml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index 4c3be8a..bcd68ac 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -4,7 +4,7 @@ class EmbedController < ApplicationController block = Block.find(params[:id]) source = params[:source] - if !block.visible? + if !block.embedable? || !block.visible? render :template => 'shared/embed_denied.rhtml', :status => 403, :layout => "embed" else locals = {:source => source, :block => block} diff --git a/app/models/block.rb b/app/models/block.rb index d2fd8bf..c007686 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -17,7 +17,7 @@ class Block < ActiveRecord::Base named_scope :enabled, :conditions => { :enabled => true } def embedable? - true + false end def embed_code(url) diff --git a/app/views/shared/embed_denied.rhtml b/app/views/shared/embed_denied.rhtml index 1d113ce..82089e4 100644 --- a/app/views/shared/embed_denied.rhtml +++ b/app/views/shared/embed_denied.rhtml @@ -1,3 +1,3 @@
-

<%= _('Embed denied. The requested embed is disable.') %>

+

<%= _('Embed denied.') %>

-- libgit2 0.21.2