saurabh
/
pagecontent
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fetch wrong version page_context problem.

This commit is contained in:
BoHung Chiu 2020-11-14 11:30:45 +08:00
parent 74d1986002
commit bedcf2b985
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/page_contents_controller.rb
View File

@ -9,7 +9,7 @@ class PageContentsController < OrbitAdminController
else else
page = Page.where(:page_id => params[:page_id]).first page = Page.where(:page_id => params[:page_id]).first
name = page.name rescue "" 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}" : "" url_to_edit = OrbitHelper.user_can_edit?(page) ? "/admin/page_contents/new?page_id=#{page.id.to_s}" : ""
end end
request = OrbitHelper.request request = OrbitHelper.request

5
app/models/page_context.rb
View File

@ -13,7 +13,10 @@ class PageContext
# field :current, :type => Boolean, :default => false # field :current, :type => Boolean, :default => false
belongs_to :page 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 def pp_object
page.title page.title
end end

4
app/views/admin/page_contents/new.html.erb
View File

@ -1,6 +1,7 @@
<% content_for :page_specific_css do %> <% content_for :page_specific_css do %>
<%= stylesheet_link_tag "lib/main-forms" %> <%= stylesheet_link_tag "lib/main-forms" %>
<% end %> <% 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| %> <%= form_for @page_content, :url => {:action => :create}, :html => {:class => 'form-horizontal main-forms'} do |f| %>
<fieldset> <fieldset>
<div class="input-area"> <div class="input-area">
@ -31,7 +32,7 @@
<%= label_tag(locale, t(:content), :class=>"control-label muted") %> <%= label_tag(locale, t(:content), :class=>"control-label muted") %>
<div class="controls"> <div class="controls">
<div class="textarea"> <div class="textarea">
<%= con.text_area locale, :class => "ckeditor input-block-level", :value => (@page.page_contexts.last.content_translations[locale] rescue nil)%> <%= con.text_area locale, :class => "ckeditor input-block-level", :value => (@page_context.content_translations[locale] rescue nil)%>
</div> </div>
</div> </div>
<% end %> <% end %>
@ -42,7 +43,6 @@
</div> </div>
<div class="form-actions"> <div class="form-actions">
<%= f.hidden_field :page_id, :value=>@page.id.to_s %> <%= f.hidden_field :page_id, :value=>@page.id.to_s %>
<%= f.hidden_field :version, :value=>((@page.page_contexts.last.version + 1) rescue 1)%>
<input type="hidden" name="referer_url" value="<%= request.referer %>"> <input type="hidden" name="referer_url" value="<%= request.referer %>">
<%= f.submit t("page_content.save"), :class=> "btn btn-primary bt-form-save" %> <%= f.submit t("page_content.save"), :class=> "btn btn-primary bt-form-save" %>
</div> </div>