diff --git a/app/controllers/page_contents_controller.rb b/app/controllers/page_contents_controller.rb index 37e327c..a508e6d 100644 --- a/app/controllers/page_contents_controller.rb +++ b/app/controllers/page_contents_controller.rb @@ -9,7 +9,7 @@ class PageContentsController < OrbitAdminController else page = Page.where(:page_id => params[:page_id]).first name = page.name rescue "" - html = page.page_contexts.last.content rescue "" + html = page.page_contexts.order(:version=>-1).first.content rescue "" url_to_edit = OrbitHelper.user_can_edit?(page) ? "/admin/page_contents/new?page_id=#{page.id.to_s}" : "" end request = OrbitHelper.request diff --git a/app/models/page_context.rb b/app/models/page_context.rb index ce8d82d..5520379 100644 --- a/app/models/page_context.rb +++ b/app/models/page_context.rb @@ -13,7 +13,10 @@ class PageContext # field :current, :type => Boolean, :default => false belongs_to :page - + before_create do |record| + last_version = record.page.page_contexts.order(:version=>-1).first.version rescue 0 + record.version = last_version + 1 + end def pp_object page.title end diff --git a/app/views/admin/page_contents/new.html.erb b/app/views/admin/page_contents/new.html.erb index 1fecb02..51ef10d 100644 --- a/app/views/admin/page_contents/new.html.erb +++ b/app/views/admin/page_contents/new.html.erb @@ -1,6 +1,7 @@ <% content_for :page_specific_css do %> <%= stylesheet_link_tag "lib/main-forms" %> <% end %> +<% @page_context = @page.page_contexts.order(:version=>-1).first #take last version page_context %> <%= form_for @page_content, :url => {:action => :create}, :html => {:class => 'form-horizontal main-forms'} do |f| %>