From 2ed5d10b9dbb7f4ecb1b0546bbb89282360b4bda Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 18 Jul 2014 17:21:16 +0800 Subject: [PATCH] added page number fix for new pages --- app/controllers/admin/import_controller.rb | 4 ++++ app/controllers/pages_controller.rb | 1 + app/models/page.rb | 1 - app/views/pages/_form.html.erb | 2 +- app/views/pages/_form_link.html.erb | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb index f4b043d..8a0bd3f 100644 --- a/app/controllers/admin/import_controller.rb +++ b/app/controllers/admin/import_controller.rb @@ -231,6 +231,7 @@ class Admin::ImportController < OrbitAdminController page_id = page_id + "_" + (number + 1).to_s end p = Page.new(:page_id => page_id, :parent_page_id => Page.root.id, :page_type => "page", :url => "/#{page_id}", :module => "page_content", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>page["title"]["en"], "zh_tw" => page["title"]["zh_tw"]},:rss2_id => page["page_id"]) + p.number = Page.root.child_page.max(:number) + 1 p.save en = smart_downloader(page["content"]["en"],data["site_url"]) zh_tw = smart_downloader(page["content"]["zh_tw"],data["site_url"]) @@ -253,6 +254,7 @@ class Admin::ImportController < OrbitAdminController case childpage["type"] when "page" cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "page", :url => "/#{p.page_id}/#{p_id}", :module => "page_content", "enabled_for" => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]},:rss2_id => childpage["page_id"]) + cp.number = p.child_page.max(:number) + 1 cp.save en = smart_downloader(childpage["content"]["en"],data["site_url"]) zh_tw = smart_downloader(childpage["content"]["zh_tw"],data["site_url"]) @@ -260,6 +262,7 @@ class Admin::ImportController < OrbitAdminController page_context.save when "exturl" cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => childpage["url"], "zh_tw" => childpage["url"]},:rss2_id => childpage["page_id"]) + cp.number = p.child_page.max(:number) + 1 cp.save when "file" asset = Asset.new @@ -270,6 +273,7 @@ class Admin::ImportController < OrbitAdminController @user.save external_url = asset.data.url cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => external_url, "zh_tw" => external_url},:rss2_id => childpage["page_id"]) + cp.number = p.child_page.max(:number) + 1 cp.save end end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 343c1a4..2e6b218 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -320,6 +320,7 @@ class PagesController < ApplicationController p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") end + p[:number] = page.child_page.max(:number) + 1 p end diff --git a/app/models/page.rb b/app/models/page.rb index d577749..8b66303 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -27,7 +27,6 @@ class Page has_many :child_page, :class_name => 'Page', :inverse_of => :parent_page, :dependent => :destroy belongs_to :parent_page, :class_name => 'Page', :inverse_of => :child_page - def to_param page_id.parameterize end diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb index 689c39e..6bec136 100644 --- a/app/views/pages/_form.html.erb +++ b/app/views/pages/_form.html.erb @@ -5,7 +5,7 @@ <% if params[:action] == "new" %>
- <%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id already taken.;"} %> + <%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
<% end %> diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb index 5f37e88..093cd58 100644 --- a/app/views/pages/_form_link.html.erb +++ b/app/views/pages/_form_link.html.erb @@ -6,7 +6,7 @@ <% if params[:action] == "new" %>
- <%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id already taken.;"} %> + <%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %>
<% end %>