diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 7a966ffe9..bbc63aebf 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -5,7 +5,8 @@ class Admin::PagesController < Admin::ItemsController def show @item = Page.find(params[:id]) @no_orbit_bar = true - render layout: 'page_layout' + @edit = true + render :text => parse_page_content(@item), :layout => 'page_layout' end def new diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index ec1008715..48261bf74 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -26,7 +26,13 @@ class PagesController < ApplicationController when 'Page' if params[:clicked_field_name] render_page({"clicked_field_name"=>params["clicked_field_name"]}) unless save_from_no_lang_for_page + elsif params[:edit] + if request.referer && request.referer.ends_with?("admin/items") + redirect_to admin_page_url(@item) else + render :file => "#{Rails.root}/public/403.html", :status => 403 + end + else render_page(params.except(:controller, :action, :page_name)) unless save_from_no_lang_for_page end when 'Link' diff --git a/app/views/admin/items/_node.html.erb b/app/views/admin/items/_node.html.erb index fd5dcda97..d60615a55 100644 --- a/app/views/admin/items/_node.html.erb +++ b/app/views/admin/items/_node.html.erb @@ -17,7 +17,7 @@ <%= link_to node.title, node.url %> <% end %>